Updated

2024-01-06 11:09:36 +01:00
parent 8b85ba35fa
commit 931d43f1a4
16 changed files with 713 additions and 390 deletions
--- a/Chart/templates/ingress.yaml
+++ b/Chart/templates/ingress.yaml
@@ -9,72 +9,27 @@ metadata:
    {{- include "..labels" . | nindent 4 }}
 spec:
  ingressClassName: nginx
-  tls:
+{{- if or .Values.site.certificate.certManager .Values.site.certificate.importCert }}
+  tls: 
    - secretName: {{ include "..fullname" . }}-cert-secret
-      hosts:
-        - {{ .Values.site.domain | replace "www." "" }}
-        - www.{{ .Values.site.domain | replace "www." "" }}
-        - {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-        - www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-{{- if .Values.site.additionalIngressDomains  }}
-    {{- range .Values.site.additionalIngressDomains }}
-        - {{ . }}
-    {{- end }}
-{{- end }}
-      
+      hosts: {{ include "..domains" . | nindent 6 }}
+{{- else if .Values.site.certificate.existingCert }}
+  tls: 
+    - secretName: {{ .Values.site.certificate.existingCertName }}
+      hosts: {{ include "..domains" . | nindent 6 }}
+{{- end }}    
  rules:
-    - host: {{ .Values.site.domain | replace "www." "" }}
+    {{- range include "..domains" . | split "\n" }}
+    {{- if ne . "" }}
+    - host: {{ . | replace "- " ""}}
      http:
        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80            
-    - host: www.{{ .Values.site.domain | replace "www." "" }}
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80
-    - host: {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80
-
-    - host: www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80  
-      {{- if .Values.site.additionalIngressDomains  }}
-        {{- range .Values.site.additionalIngressDomains }}
-    - host: {{ . }}
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" $ }}
-              port:
-                number: 80
-        {{- end }}
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "..fullname" $ }}
+                port:
+                  number: 80
+    {{- end }}
    {{- end }}