templates/ingress.yaml を更新

templates/ingress.yaml

@@ -13,9 +13,15 @@ spec:
   {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
-  {{- if .Values.ingress.tls }}
+  {{- if or .Values.ingress.tls .Values.ingress.extraTls }}
   tls:
-    {{- range .Values.ingress.tls }}
+    {{- if .Values.ingress.tls }}
+    - hosts:
+        - {{ .Values.ingress.hostname | quote }}
+      secretName: {{ .Values.ingress.hostname | replace "." "-" }}-tls
+    {{- end }}
+    {{- if .Values.ingress.extraTls }}
+    {{- range .Values.ingress.extraTls }}
     - hosts:
         {{- range .hosts }}
         - {{ . | quote }}
@@ -23,19 +29,28 @@ spec:
       secretName: {{ .secretName }}
     {{- end }}
     {{- end }}
+  {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
+    - host: {{ .Values.ingress.hostname | quote }}
-    - host: {{ .host | quote }}
+      http:
+        paths:
+          - path: {{ .Values.ingress.path }}
+            pathType: {{ .Values.ingress.pathType }}
+            backend:
+              service:
+                name: {{ include "wordpress-nginx.fullname" . }}
+                port:
+                  number: {{ $.Values.service.port }}
+    {{- range .Values.ingress.extraHosts }}
+    - host: {{ .name | quote }}
       http:
         paths:
-          {{- range .paths }}
           - path: {{ .path }}
-            pathType: {{ .pathType }}
+            pathType: Prefix
             backend:
               service:
                 name: {{ include "wordpress-nginx.fullname" $ }}
                 port:
                   number: {{ $.Values.service.port }}
     {{- end }}
-    {{- end }}
 {{- end }}