helm: refactor ingress.yaml to improve structure and support multiple hosts MAPCO-10675

helm/templates/ingress.yaml

@@ -1,34 +1,76 @@
-{{- $releaseName := .Release.Name -}}
-{{- $chartName := include "jobnik-manager.name" . -}}
 {{- if and (.Values.enabled) (.Values.ingress.enabled) -}}
+{{- $fullName := include "jobnik-manager.fullname" . -}}
+{{- $serviceName := printf "%s-service" $fullName -}}
+{{- $servicePort := .Values.env.port -}}
+{{- $ingressPath := .Values.ingress.path -}}
+{{- $ingressPathType := default "Prefix" .Values.ingress.pathType -}}
+{{- $extraPaths := .Values.ingress.extraPaths -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $releaseName }}-{{ $chartName }}-ingress
+  name: {{ $fullName }}-ingress
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "jobnik-manager.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.org/mergeable-ingress-type: "minion"
-    nginx.org/rewrites: 'serviceName={{ $releaseName }}-{{ $chartName }} rewrite=/'    
-    nginx.org/location-snippets: |
-      if ($request_method = OPTIONS) {
-        return 204;
-      }
-    {{- if .Values.ingress.cors.enabled }}
-      add_header 'Access-Control-Allow-Origin' '{{- .Values.ingress.cors.origin -}}';
-      add_header 'Access-Control-Max-Age' 3600;
-      add_header 'Access-Control-Expose-Headers' 'Content-Length';
-      add_header 'Access-Control-Allow-Headers' '*';
+    {{- range $key, $value := . }}
+    {{ $key }}: {{ tpl ($value | toString) $ | quote }}
     {{- end }}
+  {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- with .Values.ingress.tls }}
+  tls:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   rules:
-  - http:
-      paths:
-      - path: {{ .Values.ingress.path }}
-        pathType: Prefix
-        backend:
-          service:
-            name: {{ printf "%s-service" (include "jobnik-manager.fullname" .) }}
-            port:
-              number: {{ .Values.env.port }}
-    host: {{ .Values.ingress.host | quote }}
-{{- end -}}
+  {{- if .Values.ingress.hosts  }}
+  {{- range .Values.ingress.hosts }}
+    - host: {{ tpl . $ | quote }}
+      http:
+        paths:
+          {{- with $extraPaths }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+  {{- end }}
+  {{- else if .Values.ingress.host }}
+    - host: {{ tpl .Values.ingress.host $ | quote }}
+      http:
+        paths:
+          {{- with $extraPaths }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+  {{- else }}
+    - http:
+        paths:
+          - backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+            {{- with $ingressPath }}
+            path: {{ . }}
+            {{- end }}
+            pathType: {{ $ingressPathType }}
+  {{- end -}}
+{{- end }}

helm/values.yaml

@@ -131,7 +131,11 @@ route:
 ingress:
   enabled: false
   path: /
+  pathType: Prefix
   host: 'localhost'
-  cors:
-    enabled: true
-    origin: '*'
+  hosts: []
+  extraPaths: []
+  labels: {}
+  annotations: {}
+  className: ""
+  tls: []