[release/v1.0] Pin EnvoyProxy and RateLimit images (envoyproxy#2783)

Signed-off-by: bitliu <bitliu@tencent.com>
arkodg · Mar 5, 2024 · 7d48480 · 7d48480
1 parent d8ff060
commit 7d48480
Show file tree

Hide file tree

Showing 35 changed files with 36 additions and 36 deletions.
diff --git a/api/v1alpha1/shared_types.go b/api/v1alpha1/shared_types.go
@@ -20,15 +20,15 @@ const (
 	// DefaultDeploymentMemoryResourceRequests for deployment memory resource
 	DefaultDeploymentMemoryResourceRequests = "512Mi"
 	// DefaultEnvoyProxyImage is the default image used by envoyproxy
-	DefaultEnvoyProxyImage = "envoyproxy/envoy:distroless-dev"
+	DefaultEnvoyProxyImage = "envoyproxy/envoy:distroless-v1.29-latest"
 	// DefaultShutdownManagerCPUResourceRequests for shutdown manager cpu resource
 	DefaultShutdownManagerCPUResourceRequests = "10m"
 	// DefaultShutdownManagerMemoryResourceRequests for shutdown manager memory resource
 	DefaultShutdownManagerMemoryResourceRequests = "32Mi"
 	// DefaultShutdownManagerImage is the default image used for the shutdown manager.
 	DefaultShutdownManagerImage = "envoyproxy/gateway-dev:latest"
 	// DefaultRateLimitImage is the default image used by ratelimit.
-	DefaultRateLimitImage = "envoyproxy/ratelimit:master"
+	DefaultRateLimitImage = "envoyproxy/ratelimit:19f2079f"
 	// HTTPProtocol is the common-used http protocol.
 	HTTPProtocol = "http"
 	// GRPCProtocol is the common-used grpc protocol.

diff --git a/internal/gatewayapi/testdata/disable-accesslog.in.yaml b/internal/gatewayapi/testdata/disable-accesslog.in.yaml
@@ -21,7 +21,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.in.yaml
@@ -27,7 +27,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.in.yaml
@@ -30,7 +30,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.in.yaml
@@ -28,7 +28,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml
@@ -35,7 +35,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.in.yaml
@@ -18,7 +18,7 @@ envoyproxy:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.29-latest"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml
@@ -60,7 +60,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.29-latest
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml
@@ -58,7 +58,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml
@@ -59,7 +59,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
@@ -155,7 +155,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
@@ -192,7 +192,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
@@ -186,7 +186,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml
@@ -59,7 +59,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
@@ -183,7 +183,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
@@ -181,7 +181,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.29-latest
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml
@@ -81,7 +81,7 @@ spec:
           value: /certs/ca.crt
         - name: FORCE_START_WITHOUT_INITIAL_CONFIG
           value: "true"
-        image: envoyproxy/ratelimit:master
+        image: envoyproxy/ratelimit:19f2079f
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml
@@ -77,7 +77,7 @@ spec:
           value: /certs/ca.crt
         - name: FORCE_START_WITHOUT_INITIAL_CONFIG
           value: "true"
-        image: envoyproxy/ratelimit:master
+        image: envoyproxy/ratelimit:19f2079f
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml
@@ -81,7 +81,7 @@ spec:
           value: /certs/ca.crt
         - name: FORCE_START_WITHOUT_INITIAL_CONFIG
           value: "true"
-        image: envoyproxy/ratelimit:master
+        image: envoyproxy/ratelimit:19f2079f
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml
@@ -81,7 +81,7 @@ spec:
           value: /certs/ca.crt
         - name: FORCE_START_WITHOUT_INITIAL_CONFIG
           value: "true"
-        image: envoyproxy/ratelimit:master
+        image: envoyproxy/ratelimit:19f2079f
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml b/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml
@@ -81,7 +81,7 @@ spec:
           value: /certs/ca.crt
         - name: FORCE_START_WITHOUT_INITIAL_CONFIG
           value: "true"
-        image: envoyproxy/ratelimit:master
+        image: envoyproxy/ratelimit:19f2079f
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/site/content/en/latest/user/global-rate-limit.md b/site/content/en/latest/user/global-rate-limit.md
@@ -784,7 +784,7 @@ data:
         rateLimitDeployment:
           replicas: 1
           container:
-            image: envoyproxy/ratelimit:master
+            image: envoyproxy/ratelimit:19f2079f
             env:
             - name: CACHE_KEY_PREFIX
               value: "eg:rl:"

diff --git a/site/content/en/v0.4.0/user/rate-limit.md b/site/content/en/v0.4.0/user/rate-limit.md
@@ -592,7 +592,7 @@ data:
         rateLimitDeployment:
           replicas: 1
           container:
-            image: envoyproxy/ratelimit:master
+            image: envoyproxy/ratelimit:19f2079f
             resources:
               requests:
                 cpu: 100m

diff --git a/site/content/en/v0.5.0/user/rate-limit.md b/site/content/en/v0.5.0/user/rate-limit.md
@@ -763,7 +763,7 @@ data:
         rateLimitDeployment:
           replicas: 1
           container:
-            image: envoyproxy/ratelimit:master
+            image: envoyproxy/ratelimit:19f2079f
             env:
             - name: CACHE_KEY_PREFIX
               value: "eg:rl:"

diff --git a/site/content/en/v0.6.0/user/rate-limit.md b/site/content/en/v0.6.0/user/rate-limit.md
@@ -778,7 +778,7 @@ data:
         rateLimitDeployment:
           replicas: 1
           container:
-            image: envoyproxy/ratelimit:master
+            image: envoyproxy/ratelimit:19f2079f
             env:
             - name: CACHE_KEY_PREFIX
               value: "eg:rl:"