From 5054226c47efa1f4060f6a90970b323ef0bf0504 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 20 Apr 2020 11:13:48 -0400 Subject: [PATCH] custom ingress woo --- k8s/deploy.yaml | 4 ++-- k8s/ingress.yaml | 47 +++++++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/k8s/deploy.yaml b/k8s/deploy.yaml index 5efda4c..aadfdd3 100644 --- a/k8s/deploy.yaml +++ b/k8s/deploy.yaml @@ -23,8 +23,8 @@ spec: name: jf-cache resources: limits: - memory: "2Gi" - cpu: "2" + memory: "4Gi" + cpu: "4" requests: memory: "100Mi" cpu: "1m" diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml index 13b81af..5995aa8 100644 --- a/k8s/ingress.yaml +++ b/k8s/ingress.yaml @@ -16,23 +16,38 @@ spec: - backend: serviceName: jf servicePort: 8096 + --- -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress + +apiVersion: traefik.containo.us/v1alpha1 +kind: IngressRoute metadata: - annotations: - kubernetes.io/ingress.class: "traefik-external" - ingress.kubernetes.io/ssl-redirect: "true" - traefik.ingress.kubernetes.io/router.entrypoints: websecure - name: jf-external + name: jf-external-tls spec: + entryPoints: + - websecure tls: - - secretName: letsencrypt - rules: - - host: jellyfin.ducoterra.net - http: - paths: - - path: / - backend: - serviceName: jf - servicePort: 8096 \ No newline at end of file + secretName: letsencrypt + routes: + - match: Host(`jellyfin.ducoterra.net`) + kind: Rule + services: + - name: jf + port: 8096 + +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: IngressRoute +metadata: + name: jf-external-web +spec: + entryPoints: + - web + routes: + - match: Host(`jellyfin.ducoterra.net`) + kind: Rule + services: + - name: jf + port: 8096 + middlewares: + - name: httpsredirect