Revert "feat(chart): Allow configuring envoy proxy image via helm chart (#8785)"

This reverts commit 092cc67.

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

Author: cnvergence

charts/gateway-helm/README.md

@@ -103,9 +103,6 @@ helm uninstall eg -n envoy-gateway-system
 | global.images.envoyGateway.image | string | `nil` |  |
 | global.images.envoyGateway.pullPolicy | string | `nil` |  |
 | global.images.envoyGateway.pullSecrets | list | `[]` |  |
-| global.images.envoyProxy.image | string | `""` |  |
-| global.images.envoyProxy.pullPolicy | string | `""` |  |
-| global.images.envoyProxy.pullSecrets | list | `[]` |  |
 | global.images.ratelimit.image | string | `"docker.io/envoyproxy/ratelimit:05c08d03"` |  |
 | global.images.ratelimit.pullPolicy | string | `"IfNotPresent"` |  |
 | global.images.ratelimit.pullSecrets | list | `[]` |  |

charts/gateway-helm/templates/_helpers.tpl

@@ -148,61 +148,11 @@ imagePullSecrets: {{ toYaml list }}
 {{- end }}
 {{- end }}
 
-{{/*
-Resolve the Envoy Proxy image.
-*/}}
-{{- define "eg.envoyProxy.image" -}}
-{{-   $imageParts := splitn "/" 2 .Values.global.images.envoyProxy.image -}}
-{{/*    if global.imageRegistry is defined, it takes precedence always */}}
-{{-   $registryName := default $imageParts._0 .Values.global.imageRegistry -}}
-{{-   $repositoryTag := $imageParts._1 -}}
-{{-   $repositoryParts := splitn ":" 2 $repositoryTag -}}
-{{-   $repositoryName := $repositoryParts._0 -}}
-{{-   $imageTag := default "distroless-dev" $repositoryParts._1 -}}
-{{-   printf "%s/%s:%s" $registryName $repositoryName $imageTag -}}
-{{- end -}}
-
-{{/*
-Resolve the Envoy Proxy image pull secrets.
-*/}}
-{{- define "eg.envoyProxy.image.pullSecrets" -}}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml .Values.global.imagePullSecrets }}
-{{- else if .Values.global.images.envoyProxy.pullSecrets -}}
-imagePullSecrets:
-{{ toYaml .Values.global.images.envoyProxy.pullSecrets }}
-{{- else }}
-imagePullSecrets: {{ toYaml list }}
-{{- end }}
-{{- end }}
 
 {{/*
 The default Envoy Gateway configuration.
 */}}
 {{- define "eg.default-envoy-gateway-config" -}}
-{{- if or .Values.global.images.envoyProxy.image .Values.config.envoyGateway.envoyProxy }}
-{{- $envoyProxyBase := .Values.config.envoyGateway.envoyProxy | default dict }}
-{{- $imageOverride := dict }}
-{{- if .Values.global.images.envoyProxy.image }}
-  {{- $container := dict "image" (include "eg.envoyProxy.image" .) }}
-  {{- if .Values.global.images.envoyProxy.pullPolicy }}
-    {{- $_ := set $container "imagePullPolicy" .Values.global.images.envoyProxy.pullPolicy }}
-  {{- end }}
-  {{- $deployment := 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 }}
-  {{- end }}
-  {{- $kubernetes := dict "envoyDeployment" $deployment }}
-  {{- $provider := dict "type" "Kubernetes" "kubernetes" $kubernetes }}
-  {{- $imageOverride = dict "provider" $provider }}
-{{- end }}
-{{- $merged := mustMergeOverwrite (dict) $envoyProxyBase $imageOverride }}
-envoyProxy:
-{{ toYaml $merged | indent 2 }}
-{{- end }}
 provider:
   type: Kubernetes
   kubernetes:

charts/gateway-helm/values.tmpl.yaml

@@ -1,6 +1,6 @@
 # Global settings
 global:
-  # If set, these take highest precedence and change envoyGateway, envoyProxy, and ratelimit's container registry and pull secrets.
+  # If set, these take highest precedence and change both envoyGateway and ratelimit's container registry and pull secrets.
   # -- Global override for image registry
   imageRegistry: ""
   # -- Global override for image pull secrets
@@ -25,15 +25,6 @@ global:
       pullPolicy: IfNotPresent
       # List of secrets in the same namespace of the component that can be used to pull images from private repositories.
       pullSecrets: []
-    envoyProxy:
-      # This is the full image name including the hub, repo, and tag for the Envoy Proxy data plane.
-      # If not specified, uses the default image built into envoy-gateway.
-      image: ""
-      # Specify image pull policy if default behavior isn't desired.
-      # Default behavior: IfNotPresent.
-      pullPolicy: ""
-      # List of secrets in the same namespace of the component that can be used to pull images from private repositories.
-      pullSecrets: []
 
 podDisruptionBudget:
   minAvailable: 0

release-notes/current.yaml

@@ -10,7 +10,6 @@ security updates: |
   Bump Envoy ratelimit image to `05c08d03`.
 # New features or capabilities added in this release.
 new features: |
-  Added support for defining Envoy Proxy image, pullPolicy, and pullSecrets via the helm chart.  Note that to merge these helm-configured values with EnvoyProxy resources, the EnvoyProxy must include `mergeType: StrategicMerge` or `mergeType: JSONMerge`.
 
 bug fixes: |
   Rejected ClientTrafficPolicy if invalid TLS cipher suites are configured.

release-notes/v1.7.3.yaml

@@ -10,7 +10,7 @@ security updates: |
 
 # New features or capabilities added in this release.
 new features: |
-  Added support for defining Envoy Proxy image, pullPolicy, and pullSecrets via the helm chart. Note that to merge these helm-configured values with EnvoyProxy resources, the EnvoyProxy must include `mergeType: StrategicMerge` or `mergeType: JSONMerge`.
+
 
 bug fixes: |
   Fixed a control plane panic caused by concurrent Status mutation racing with the watchable Map coalesce goroutine.

site/content/en/latest/install/gateway-helm-api.md

@@ -67,9 +67,6 @@ The Helm chart for Envoy Gateway
 | global.images.envoyGateway.image | string | `nil` |  |
 | global.images.envoyGateway.pullPolicy | string | `nil` |  |
 | global.images.envoyGateway.pullSecrets | list | `[]` |  |
-| global.images.envoyProxy.image | string | `""` |  |
-| global.images.envoyProxy.pullPolicy | string | `""` |  |
-| global.images.envoyProxy.pullSecrets | list | `[]` |  |
 | global.images.ratelimit.image | string | `"docker.io/envoyproxy/ratelimit:05c08d03"` |  |
 | global.images.ratelimit.pullPolicy | string | `"IfNotPresent"` |  |
 | global.images.ratelimit.pullSecrets | list | `[]` |  |

test/helm/gateway-helm/global-images-config.in.yaml

@@ -12,9 +12,3 @@ global:
       pullSecrets:
         - name: "secret3"
         - name: "secret4"
-    envoyProxy:
-      image: "private-hub/envoyproxy/envoy:dev"
-      pullPolicy: Always
-      pullSecrets:
-        - name: "secret5"
-        - name: "secret6"

test/helm/gateway-helm/global-images-config.out.yaml

@@ -28,18 +28,6 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
-    envoyProxy:
-      provider:
-        kubernetes:
-          envoyDeployment:
-            container:
-              image: private-hub/envoyproxy/envoy:dev
-              imagePullPolicy: Always
-            pod:
-              imagePullSecrets:
-              - name: secret5
-              - name: secret6
-        type: Kubernetes
     extensionApis: {}
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller