From 46f2baa68ca43a614bbcb080c481b69a37d93d84 Mon Sep 17 00:00:00 2001
From: Jimmy Bourque <jbourque@bridgephase.com>
Date: Mon, 30 Sep 2024 13:23:07 -0500
Subject: [PATCH] Realized there was a much easier fix for the k8s issue
---
chart/templates/istio/values.yaml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/chart/templates/istio/values.yaml b/chart/templates/istio/values.yaml
index a37cb5c804..1b389d54ab 100644
--- a/chart/templates/istio/values.yaml
+++ b/chart/templates/istio/values.yaml
@@ -90,12 +90,7 @@ ingressGateways:
{{- range $name, $values := .Values.istio.ingressGateways }}
{{ if ne $values.enabled false }}
{{ $name | nindent 2 }}:
- {{- if or (hasKey $values "k8s") (and (hasKey $values "kubernetesResourceSpec") (not (empty $values.kubernetesResourceSpec))) }}
- {{- toYaml (merge (dict "k8s" $values.kubernetesResourceSpec) (dict "k8s" $values.k8s)) | nindent 4 }}
- {{- else }}
- {{- toYaml (fromYaml (include "istio.ingressgateway.k8s" $values)) | nindent 4 }}
- {{- end }}
- {{- if $values.extraLabels }}
+ {{- toYaml (merge (dict "k8s" $values.kubernetesResourceSpec) (dict "k8s" $values.k8s) (fromYaml (include "istio.ingressgateway.k8s" $values))) | nindent 4 }}
{{- toYaml (dict "extraLabels" $values.extraLabels) | nindent 4 }}
{{- end}}
{{- end }}
--
GitLab