release/v1.1: pin envoy version (envoyproxy#3933)

* fix release note file name Signed-off-by: Guy Daich <[email protected]> * pin envoy and ratelimit versions Signed-off-by: Guy Daich <[email protected]> --------- Signed-off-by: Guy Daich <[email protected]>
guydc · Jul 22, 2024 · cc08e17 · cc08e17
1 parent d0f7715
commit cc08e17
Show file tree

Hide file tree

Showing 69 changed files with 70 additions and 70 deletions.
diff --git a/api/v1alpha1/shared_types.go b/api/v1alpha1/shared_types.go
@@ -21,15 +21,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.31.0"
 	// 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:91484c59"
 	// HTTPProtocol is the common-used http protocol.
 	HTTPProtocol = "http"
 	// GRPCProtocol is the common-used grpc protocol.

diff --git a/examples/kubernetes/envoy-proxy-config.yaml b/examples/kubernetes/envoy-proxy-config.yaml
@@ -22,7 +22,7 @@ spec:
       envoyDeployment:
         replicas: 2
         container:
-          image: envoyproxy/envoy:v1.26-latest
+          image: envoyproxy/envoy:distroless-v1.31.0
           resources:
             requests:
               cpu: 150m

diff --git a/internal/gatewayapi/testdata/disable-accesslog.in.yaml b/internal/gatewayapi/testdata/disable-accesslog.in.yaml
@@ -21,7 +21,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   resources:
                     requests:
                       cpu: 100m

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

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-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.31.0
                   resources:
                     requests:
                       cpu: 100m

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

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

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

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.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.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.in.yaml
@@ -38,7 +38,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             resources:
               requests:
                 cpu: 100m

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

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

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.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.31.0
                   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 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   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 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   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
@@ -29,7 +29,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   resources:
                     requests:
                       cpu: 100m

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

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-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.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.in.yaml
@@ -57,7 +57,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.in.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.in.yaml
@@ -27,7 +27,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml
@@ -67,7 +67,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend.in.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend.in.yaml
@@ -27,7 +27,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend.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.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.in.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.in.yaml
@@ -27,7 +27,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml
@@ -67,7 +67,7 @@ infraIR:
                     value: env_a_value
                   - name: env_b
                     value: env_b_name
-                  image: envoyproxy/envoy:distroless-dev
+                  image: envoyproxy/envoy:distroless-v1.31.0
                   resources:
                     requests:
                       cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.in.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.in.yaml
@@ -27,7 +27,7 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             resources:
               requests:
                 cpu: 100m

diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.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.31.0
                   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 @@ envoyProxyForGatewayClass:
               value: env_a_value
             - name: env_b
               value: env_b_name
-            image: "envoyproxy/envoy:distroless-dev"
+            image: "envoyproxy/envoy:distroless-v1.31.0"
             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.31.0
                   resources:
                     requests:
                       cpu: 100m

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

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

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

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

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
@@ -221,7 +221,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: envoyproxy/envoy:distroless-dev
+        image: envoyproxy/envoy:distroless-v1.31.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

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

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

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

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