UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 991c853e authored by Jimmy Bourque's avatar Jimmy Bourque
Browse files

Added additional condition to ensure a default deployment doesn't use a blank...

Added additional condition to ensure a default deployment doesn't use a blank dictionary for k8s values
parent 84181f1d
No related branches found
No related tags found
1 merge request!5163Updated istio values umbrella template
Pipeline #3641906 passed
......@@ -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 }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment