Skip to content

Commit 2794157

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

3 files changed

Lines changed: 14 additions & 4 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 }}

release-notes/current.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ bug fixes: |
2525
Fixed `MaxStreamDuration` not being set on `CommonHttpProtocolOptions` for non-route cluster.
2626
Fixed `egctl x status all`/`xroute`/`xpolicy` failing when a Gateway API CRD (e.g. TCPRoute) is not installed in the cluster; missing CRDs are now skipped silently, or reported on stderr with `-v`.
2727
Fixed Kubernetes Service and ServiceImport `appProtocol` values `kubernetes.io/ws` and `kubernetes.io/wss` to force HTTP/1.1 upstream connections instead of negotiating HTTP/2, avoiding compatibility issues with WebSocket backends that do not support RFC 8441 extended CONNECT.
28+
Fixed the gateway-helm chart to render the default EnvoyProxy image in the generated EnvoyGateway configuration while preserving existing `envoyDeployment` and `envoyDaemonSet` provider configurations.
2829
# Enhancements that improve performance.
2930
performance improvements: |
3031

site/content/en/community/RELEASING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export GITHUB_REMOTE=origin
5555
```shell
5656
git checkout -b release/v${MAJOR_VERSION}.${MINOR_VERSION}
5757
```
58-
f
5958
8. Push the branch to the Envoy Gateway repo.
6059

6160
```shell

0 commit comments

Comments
 (0)