Merge branch 'release/v0.6' into v0.6-docs

Signed-off-by: Arko Dasgupta <arkodg@users.noreply.github.com>
envoyproxy · Oct 28, 2023 · 8710cb6 · 8710cb6
2 parents 5d43422 + 8b11709
commit 8710cb6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/api/v1alpha1/shared_types.go b/api/v1alpha1/shared_types.go
@@ -18,9 +18,9 @@ const (
 	// DefaultDeploymentMemoryResourceRequests for deployment memory resource
 	DefaultDeploymentMemoryResourceRequests = "512Mi"
 	// DefaultEnvoyProxyImage is the default image used by envoyproxy
-	DefaultEnvoyProxyImage = "envoyproxy/envoy-dev:latest"
+	DefaultEnvoyProxyImage = "envoyproxy/envoy:distroless-v1.28-latest"
 	// DefaultRateLimitImage is the default image used by ratelimit.
-	DefaultRateLimitImage = "envoyproxy/ratelimit:master"
+	DefaultRateLimitImage = "envoyproxy/ratelimit:b9796237"
 	// HTTPProtocol is the common-used http protocol.
 	HTTPProtocol = "http"
 	// GRPCProtocol is the common-used grpc protocol.

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

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

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

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml
@@ -171,7 +171,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
-          image: envoyproxy/envoy-dev:latest
+          image: envoyproxy/envoy:distroless-v1.28-latest
           imagePullPolicy: IfNotPresent
           name: envoy
           ports:

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

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