From 991c853e1d61cb7bd7a11dce1b094dcfe0981e80 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque <jbourque@bridgephase.com> Date: Mon, 30 Sep 2024 12:01:50 -0500 Subject: [PATCH] Added additional condition to ensure a default deployment doesn't use a blank dictionary for k8s values --- chart/templates/istio/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/istio/values.yaml b/chart/templates/istio/values.yaml index 6e82fcd5bd..a37cb5c804 100644 --- a/chart/templates/istio/values.yaml +++ b/chart/templates/istio/values.yaml @@ -90,7 +90,7 @@ ingressGateways: {{- range $name, $values := .Values.istio.ingressGateways }} {{ if ne $values.enabled false }} {{ $name | nindent 2 }}: - {{- if or (hasKey $values "k8s") (hasKey $values "kubernetesResourceSpec") }} + {{- 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 }} -- GitLab