From c71be4d283677c1a7aaf44b038b3f6ae28684ed6 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 8 Aug 2021 00:48:35 +0200
Subject: [PATCH] fix: multi-cert fix for istio-ingress

---
 charts/kubezero/templates/istio-ingress.yaml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/charts/kubezero/templates/istio-ingress.yaml b/charts/kubezero/templates/istio-ingress.yaml
index ccf16218..a7d1b221 100644
--- a/charts/kubezero/templates/istio-ingress.yaml
+++ b/charts/kubezero/templates/istio-ingress.yaml
@@ -15,17 +15,12 @@ istio-ingress:
     istio-ingressgateway:
       {{- toYaml . | nindent 6 }}
   {{- end }}
-  {{- with index .Values "istio-ingress" "public" "dnsNames" }}
-  # Legacy
-  dnsNames:
-  {{- toYaml . | nindent 2 }}
-
   certificates:
+  {{- with index .Values "istio-ingress" "public" "dnsNames" }}
   - name: ingress-cert
     dnsNames:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  # New multi cert gateway
   {{- range $cert := (index .Values "istio-ingress" "public" "certificates") }}
   - name: {{ $cert.name }}
     dnsNames:
@@ -44,17 +39,12 @@ istio-private-ingress:
     istio-ingressgateway:
       {{- toYaml . | nindent 6 }}
   {{- end }}
-  {{- with index .Values "istio-ingress" "private" "dnsNames" }}
-  # Legacy
-  dnsNames:
-  {{- toYaml . | nindent 2 }}
-
   certificates:
+  {{- with index .Values "istio-ingress" "private" "dnsNames" }}
   - name: private-ingress-cert
     dnsNames:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  # New multi cert gateway
   {{- range $cert := (index .Values "istio-ingress" "private" "certificates") }}
   - name: {{ $cert.name }}
     dnsNames: