add global image settings for all images in the EG chart

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
envoyproxy · May 13, 2024 · 85cc004 · 85cc004
1 parent c30d09f
commit 85cc004
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 5 deletions.
diff --git a/charts/gateway-helm/templates/_helpers.tpl b/charts/gateway-helm/templates/_helpers.tpl
@@ -60,3 +60,18 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "envoy-gateway-config" -}}
+provider:
+  type: Kubernetes
+  kubernetes:
+    rateLimitDeployment:
+      container:
+        {{- if .Values.images.ratelimit.repository }}
+        image: {{ .Values.images.ratelimit.repository }}:{{ .Values.images.ratelimit.tag | default "master" }}
+        {{- end }}
+    shutdownManager:
+      {{- if .Values.images.shutdownManager.repository }}
+      image: {{ .Values.images.shutdownManager.repository }}:{{ .Values.images.shutdownManager.tag | default "latest" }}
+      {{- end }}
+{{- end }}
diff --git a/charts/gateway-helm/templates/certgen.yaml b/charts/gateway-helm/templates/certgen.yaml
@@ -31,7 +31,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
-        image: {{ .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
+        image: {{ .Values.images.envoyGateway.repository | default .Values.deployment.envoyGateway.image.repository }}:{{ .Values.images.envoyGateway.tag | default .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.deployment.envoyGateway.imagePullPolicy }}
         name: envoy-gateway-certgen
         {{- with .Values.certgen.job.resources }}

diff --git a/charts/gateway-helm/templates/envoy-gateway-config.yaml b/charts/gateway-helm/templates/envoy-gateway-config.yaml
@@ -9,4 +9,7 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
-    {{- toYaml .Values.config.envoyGateway | nindent 4 }}
+    {{ $baseEnvoyGatewayConfig := include "envoy-gateway-config" . | fromYaml }}
+    {{ $userEnvoyGatewayConfig := .Values.config.envoyGateway }}
+    {{ $mergedEnvoyGatewayConfig := merge $userEnvoyGatewayConfig $baseEnvoyGatewayConfig }}
+    {{- toYaml $mergedEnvoyGatewayConfig | nindent 4 }}
diff --git a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
@@ -49,7 +49,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
-        image: {{ .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
+        image: {{ .Values.images.envoyGateway.repository | default .Values.deployment.envoyGateway.image.repository }}:{{ .Values.images.envoyGateway.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.deployment.envoyGateway.imagePullPolicy }}
         livenessProbe:
           httpGet:

diff --git a/charts/gateway-helm/values.tmpl.yaml b/charts/gateway-helm/values.tmpl.yaml
@@ -1,3 +1,16 @@
+# The global image settings for all images in this chart.
+# These values will take precedence over the values in the other sections.
+images:
+  envoyGateway:
+    repository: ${ImageRepository}
+    tag: '${ImageTag}'
+  shutdownManager:
+    repository: ${ImageRepository}
+    tag: '${ImageTag}'
+  ratelimit:
+    repository: docker.io/envoyproxy/ratelimit
+    tag: 'master'
+
 deployment:
   envoyGateway:
     image:

diff --git a/site/content/en/latest/install/api.md b/site/content/en/latest/install/api.md
@@ -56,5 +56,11 @@ The Helm chart for Envoy Gateway
 | deployment.ports[2].port | int | `19001` |  |
 | deployment.ports[2].targetPort | int | `19001` |  |
 | deployment.replicas | int | `1` |  |
+| images.envoyGateway.repository | string | `"docker.io/envoyproxy/gateway"` |  |
+| images.envoyGateway.tag | string | `"latest"` |  |
+| images.ratelimit.repository | string | `"docker.io/envoyproxy/ratelimit"` |  |
+| images.ratelimit.tag | string | `"master"` |  |
+| images.shutdownManager.repository | string | `"docker.io/envoyproxy/gateway"` |  |
+| images.shutdownManager.tag | string | `"latest"` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |
 
diff --git a/test/helm/default.yaml b/test/helm/default.yaml
@@ -28,13 +28,19 @@ data:
   envoy-gateway.yaml: |
     apiVersion: gateway.envoyproxy.io/v1alpha1
     kind: EnvoyGateway
+    
+    
+    
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller
     logging:
       level:
         default: info
     provider:
       kubernetes:
+        rateLimitDeployment:
+          container:
+            image: docker.io/envoyproxy/ratelimit:master
         shutdownManager:
           image: docker.io/envoyproxy/gateway-dev:latest
       type: Kubernetes
@@ -371,7 +377,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: cluster.local
-        image: docker.io/envoyproxy/gateway-dev:latest
+        image: docker.io/envoyproxy/gateway-dev:c30d09f2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -519,7 +525,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: cluster.local
-        image: docker.io/envoyproxy/gateway-dev:latest
+        image: docker.io/envoyproxy/gateway-dev:c30d09f2
         imagePullPolicy: IfNotPresent
         name: envoy-gateway-certgen
       restartPolicy: Never