From f797416bec78fb883795924775a420c02d23e629 Mon Sep 17 00:00:00 2001
From: Jonny Ervine <git@ervine.org>
Date: Wed, 27 Sep 2023 21:19:50 +0800
Subject: [PATCH] Add ingress

---
 jellyfin/templates/ingress.yaml | 72 +++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/jellyfin/templates/ingress.yaml b/jellyfin/templates/ingress.yaml
index 8745f7c..3d979cf 100644
--- a/jellyfin/templates/ingress.yaml
+++ b/jellyfin/templates/ingress.yaml
@@ -1,24 +1,20 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "jellyfin.fullname" . -}}
+{{- if .Values.ingress.external.enabled -}}
+{{- $fullName := include "emby.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ $fullName }}-ext
   labels:
-    {{- include "jellyfin.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
+    {{- include "emby.labels" . | nindent 4 }}
+  {{- with .Values.ingress.external.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
+{{- if .Values.ingress.external.tls }}
   tls:
-  {{- range .Values.ingress.tls }}
+  {{- range .Values.ingress.external.tls }}
     - hosts:
       {{- range .hosts }}
         - {{ . | quote }}
@@ -27,15 +23,59 @@ spec:
   {{- end }}
 {{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
+  {{- range .Values.ingress.external.hosts }}
     - host: {{ .host | quote }}
       http:
         paths:
         {{- range .paths }}
-          - path: {{ . }}
+          - path: /
+            pathType: Prefix
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+        {{- end }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.ingress.internal.enabled -}}
+{{- $fullName := include "emby.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-int
+  labels:
+    {{- include "emby.labels" . | nindent 4 }}
+  {{- with .Values.ingress.external.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.ingress.internal.tls }}
+  tls:
+  {{- range .Values.ingress.internal.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.internal.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+        {{- range .paths }}
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
         {{- end }}
   {{- end }}
 {{- end }}