Merge branch 'fix/gateway-cleanup' into 'master'

fix: Remove ingress gateways from more places

See merge request !4540

chart/templates/istio/values.yaml

@@ -88,12 +88,13 @@ ingressGateways:
 {{- end }}
 
 {{- range $name, $values := .Values.istio.ingressGateways }}
+  {{ if ne $values.enabled false }}
   {{ $name | nindent 2 }}:
     {{- toYaml (merge (dict "k8s" $values.kubernetesResourceSpec) (fromYaml (include "istio.ingressgateway.k8s" $values))) | nindent 4 }}
     {{- if $values.extraLabels }}
     {{- toYaml (dict "extraLabels" $values.extraLabels) | nindent 4 }}
     {{- end}}
-    enabled: {{ ne $values.enabled false }}
+  {{- end }}
 {{- end }}
 
 {{- if .Values.istio.gateways }}
@@ -101,6 +102,7 @@ gateways:
   main: null
 {{- end }}
 {{- range $name, $values := .Values.istio.gateways }}
+  {{ if ne $values.enabled false }}
   {{ $name | nindent 2 }}:
     selector:
       app: {{ $values.ingressGateway }}
@@ -166,7 +168,7 @@ gateways:
         {{- end }}
     {{- end }}
     {{- end }}
-
+  {{- end }}
 {{- end }}
 
 {{- define "istio.ingressgateway.k8s" -}}

chart/templates/kiali/values.yaml

@@ -16,7 +16,7 @@ istio:
   enabled: {{ .Values.istio.enabled }}
   hardened:
     monitoring:
-      enabled: {{ .Values.monitoring.enabled }}    
+      enabled: {{ .Values.monitoring.enabled }}
   kiali:
     gateways:
     - istio-system/{{ default "public" .Values.kiali.ingress.gateway }}
@@ -97,15 +97,19 @@ cr:
               is_core: true
               is_proxy: false
             {{- range $name, $values := .Values.istio.ingressGateways }}
+            {{ if ne $values.enabled false }}
             - app_label: {{ $name }}
               is_core: true
               is_proxy: true
             {{- end }}
+            {{- end }}
             {{- range $name, $values := .Values.istio.values.ingressGateways }}
+            {{ if ne $values.enabled false }}
             - app_label: {{ $name }}
               is_core: true
               is_proxy: true
             {{- end }}
+            {{- end }}
     api:
       namespaces:
         # bigbang watches all!