ingress wie mattermost

tatort/templates/ingress.yaml

@@ -1,43 +1,52 @@
-{{- $fullName := include "tatort.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
-{{- $ingressPath := .Values.ingress.path -}}
-{{- $ingressPathType := .Values.ingress.pathtype -}}
-apiVersion: networking.k8s.io/v1
+{{ $ingress := .Values.ingress }}
+{{ if $ingress.enabled }}
+{{ $serviceName := include "tatort.name" . }}
+{{ $servicePort := .Values.service.externalPort }}
+apiVersion: {{ include "tatort.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "tatort.fullname" . }}
   labels:
-    app: {{ template "tatort.name" . }}
-    chart: {{ template "tatort.chart" . }}
-    component: tatort
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- with .Values.ingress.annotations }}
+    app.kubernetes.io/name: {{ include "tatort.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "tatort.chart" . }}
   annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- if .Values.ingress.tls }}
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+    {{- else }}
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    {{- end }}
+    {{- with $ingress.annotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
-{{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            pathType: {{ $ingressPathType }}
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: 4173
-  {{- end }}
+  {{ range $host := $ingress.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+      - path: {{ $ingress.path }}
+        {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+        backend:
+          service:
+            name: {{ $serviceName }}
+            port:
+              number: {{ $servicePort }}
+        pathType: Prefix
+        {{- else }}
+        backend:
+          serviceName: {{ $serviceName }}
+          servicePort: {{ $servicePort }}
+        {{- end }}
+  {{ end }}
+  {{ if $ingress.tls }}
+  tls:
+    {{- $ingress.tls | toYaml | nindent 4 }}
+  {{ end }}
+{{ end }}