Skip to content

Commit bf861bf

Browse files
fix(helm): preserve envoyProxy provider configuration
Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>
1 parent 5f0847b commit bf861bf

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

charts/gateway-helm/templates/_helpers.tpl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,23 @@ The default Envoy Gateway configuration.
199199
{{- if .Values.global.images.envoyProxy.pullPolicy }}
200200
{{- $_ := set $container "imagePullPolicy" .Values.global.images.envoyProxy.pullPolicy }}
201201
{{- end }}
202-
{{- $deployment := dict "container" $container }}
202+
203+
{{- $workload := dict "container" $container }}
204+
203205
{{- if or .Values.global.imagePullSecrets .Values.global.images.envoyProxy.pullSecrets }}
204206
{{- $pullSecretsYaml := include "eg.envoyProxy.image.pullSecrets" . }}
205207
{{- $pullSecrets := dict "imagePullSecrets" ($pullSecretsYaml | fromYaml).imagePullSecrets }}
206-
{{- $_ := set $deployment "pod" $pullSecrets }}
208+
{{- $_ := set $workload "pod" $pullSecrets }}
209+
{{- end }}
210+
211+
{{- $envoyProvider := dig "provider" "kubernetes" dict $envoyProxyBase }}
212+
{{- $workloadKey := "envoyDeployment" }}
213+
214+
{{- if hasKey $envoyProvider "envoyDaemonSet" }}
215+
{{- $workloadKey = "envoyDaemonSet" }}
207216
{{- end }}
208-
{{- $kubernetes := dict "envoyDeployment" $deployment }}
217+
218+
{{- $kubernetes := dict $workloadKey $workload }}
209219
{{- $provider := dict "type" "Kubernetes" "kubernetes" $kubernetes }}
210220
{{- $imageOverride = dict "provider" $provider }}
211221
{{- end }}

0 commit comments

Comments
 (0)