From 5dca18b77b52d317b7bfea69481d594c013c8e7e Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Mon, 15 Jun 2020 21:38:09 -0400
Subject: [PATCH] upgrade to new ingress structure

---
 k8s/ingress.yaml | 78 ++++++++++++++++++++++++++++++++----------------
 k8s/service.yaml |  2 +-
 2 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index 5995aa8..e2756bd 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -1,45 +1,31 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  annotations:
-    ingress.kubernetes.io/ssl-redirect: "true"
-  name: jf
-spec:
-  tls:
-  - hosts:
-    - jellyfin.ducoterra.net
-    secretName: letsencrypt
-  rules:
-  - host: jellyfin.ducoterra.net
-    http:
-      paths:
-      - backend:
-          serviceName: jf
-          servicePort: 8096
-
----
-
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: jf-external-tls
+  name: jellyfin-internal-tls
+  annotations:
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - websecure
   tls:
-    secretName: letsencrypt
+    certResolver: myresolver
+    domains:
+    - main: "*.ducoterra.net"
   routes:
   - match: Host(`jellyfin.ducoterra.net`)
     kind: Rule
     services:
-    - name: jf
+    - name: jellyfin-web
       port: 8096
 
 ---
+
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: jf-external-web
+  name: jellyfin-internal-web
+  annotations:
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - web
@@ -47,7 +33,47 @@ spec:
   - match: Host(`jellyfin.ducoterra.net`)
     kind: Rule
     services:
-    - name: jf
+    - name: jellyfin-web
       port: 8096
     middlewares:
       - name: httpsredirect
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: jellyfin-external-tls
+  annotations:
+    kubernetes.io/ingress.class: traefik-external
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    certResolver: myresolver
+  routes:
+  - match: Host(`jellyfin.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: jellyfin-web
+      port: 8096
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: jellyfin-external-web
+  annotations:
+    kubernetes.io/ingress.class: traefik-external
+spec:
+  entryPoints:
+    - web
+  routes:
+  - match: Host(`jellyfin.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: jellyfin-web
+      port: 8096
+    middlewares:
+      - name: httpsredirect
\ No newline at end of file
diff --git a/k8s/service.yaml b/k8s/service.yaml
index 62f5c1e..96af401 100644
--- a/k8s/service.yaml
+++ b/k8s/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: jf
+  name: jellyfin-web
 spec:
   selector:
     app: jf