fix(helm): preserve envoyProxy provider configuration

Signed-off-by: Aditya7880900936 <adityasanskarsrivastav788@gmail.com>

Author: Aditya7880900936

charts/gateway-helm/templates/_helpers.tpl

@@ -199,17 +199,27 @@ The default Envoy Gateway configuration.
   {{- if .Values.global.images.envoyProxy.pullPolicy }}
     {{- $_ := set $container "imagePullPolicy" .Values.global.images.envoyProxy.pullPolicy }}
   {{- end }}
-  {{- $deployment := dict "container" $container }}
+
+  {{- $workload := dict "container" $container }}
+
   {{- if or .Values.global.imagePullSecrets .Values.global.images.envoyProxy.pullSecrets }}
     {{- $pullSecretsYaml := include "eg.envoyProxy.image.pullSecrets" . }}
     {{- $pullSecrets := dict "imagePullSecrets" ($pullSecretsYaml | fromYaml).imagePullSecrets }}
-    {{- $_ := set $deployment "pod" $pullSecrets }}
+    {{- $_ := set $workload "pod" $pullSecrets }}
+  {{- end }}
+
+  {{- $envoyProvider := dig "provider" "kubernetes" dict $envoyProxyBase }}
+  {{- $workloadKey := "envoyDeployment" }}
+
+  {{- if hasKey $envoyProvider "envoyDaemonSet" }}
+    {{- $workloadKey = "envoyDaemonSet" }}
   {{- end }}
-  {{- $kubernetes := dict "envoyDeployment" $deployment }}
+
+  {{- $kubernetes := dict $workloadKey $workload }}
   {{- $provider := dict "type" "Kubernetes" "kubernetes" $kubernetes }}
   {{- $imageOverride = dict "provider" $provider }}
 {{- end }}
-{{- $merged := mustMergeOverwrite (dict) $envoyProxyBase $imageOverride }}
+{{- $merged := mustMergeOverwrite (dict) (deepCopy $envoyProxyBase) $imageOverride }}
 envoyProxy:
 {{ toYaml $merged | indent 2 }}
 {{- end }}

release-notes/v1.8.1.yaml

@@ -30,7 +30,7 @@ bug fixes: |
   Fixed Gateway getting stuck at `Programmed=False` after its LoadBalancer Service IP was restored, by ignoring `LastTransitionTime` when comparing status conditions.
   Fixed HPA maxReplicas required message typo in gateway-helm chart.
   Fixed invalid listeners blocking valid ones during conflict detection by validating each listener's spec independently before running conflict resolution.
-
+  Fixed the gateway-helm chart to render the default EnvoyProxy image in the generated EnvoyGateway configuration while preserving existing `envoyDeployment` and `envoyDaemonSet` provider configurations.
 # Enhancements that improve performance.
 performance improvements: |
 

site/content/en/community/RELEASING.md

@@ -55,7 +55,6 @@ export GITHUB_REMOTE=origin
    ```shell
    git checkout -b release/v${MAJOR_VERSION}.${MINOR_VERSION}
    ```
-f
 8. Push the branch to the Envoy Gateway repo.
 
     ```shell

test/helm/gateway-helm/certgen-pod-securitycontext.out.yaml

@@ -32,6 +32,13 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
+    envoyProxy:
+      provider:
+        kubernetes:
+          envoyDeployment:
+            container:
+              image: docker.io/envoyproxy/envoy:distroless-dev
+        type: Kubernetes
     extensionApis: {}
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller

test/helm/gateway-helm/deployment-strategy.out.yaml

@@ -32,6 +32,13 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
+    envoyProxy:
+      provider:
+        kubernetes:
+          envoyDeployment:
+            container:
+              image: docker.io/envoyproxy/envoy:distroless-dev
+        type: Kubernetes
     extensionApis: {}
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller

test/helm/gateway-helm/deployment-wasm-cache-volume.out.yaml

@@ -32,6 +32,13 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
+    envoyProxy:
+      provider:
+        kubernetes:
+          envoyDeployment:
+            container:
+              image: docker.io/envoyproxy/envoy:distroless-dev
+        type: Kubernetes
     extensionApis: {}
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller

test/helm/gateway-helm/envoy-daemonset-image.in.yaml

@@ -0,0 +1,13 @@
+global:
+  images:
+    envoyProxy:
+      image: "private-hub/envoyproxy/envoy:dev"
+
+config:
+  envoyGateway:
+    envoyProxy:
+      provider:
+        type: Kubernetes
+        kubernetes:
+          envoyDaemonSet:
+            name: test-daemonset