From fd3aba066df02c7a4887f2be496ea29eb133cbe3 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 25 Sep 2023 22:12:05 +0800 Subject: [PATCH] Add internal ingress --- embyserver/templates/ingress.yaml | 41 +++++++++++++++++++++++++++++++ embyserver/values.yaml | 21 ++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/embyserver/templates/ingress.yaml b/embyserver/templates/ingress.yaml index 27891f1..3d979cf 100644 --- a/embyserver/templates/ingress.yaml +++ b/embyserver/templates/ingress.yaml @@ -38,3 +38,44 @@ spec: {{- 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 }} diff --git a/embyserver/values.yaml b/embyserver/values.yaml index 22fa894..6cc47db 100644 --- a/embyserver/values.yaml +++ b/embyserver/values.yaml @@ -36,17 +36,17 @@ service: ingress: internal: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" + enabled: true + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/backend-protocol: HTTP hosts: - - host: chart-example.local + - host: emby.k8s.ipa.champion paths: [] - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + tls: + - secretName: emby-internal-tls + hosts: + - emby.k8s.ipa.champion external: enabled: true annotations: @@ -54,8 +54,7 @@ ingress: nginx.ingress.kubernetes.io/backend-protocol: HTTP hosts: - host: emby.ervine.cloud - paths: - - path: "/" + paths: [] tls: - secretName: emby-ervine-cloud-tls hosts: