test with custom image, revet this commit before merge

Signed-off-by: zirain <[email protected]>
envoyproxy · Oct 28, 2024 · 6a88c0c · 6a88c0c
1 parent 014cea1
commit 6a88c0c
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 10 deletions.
diff --git a/api/v1alpha1/shared_types.go b/api/v1alpha1/shared_types.go
@@ -30,7 +30,7 @@ const (
 	// 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 = "ghcr.io/zirain-dev/ratelimit:latest"
 	// HTTPProtocol is the common-used http protocol.
 	HTTPProtocol = "http"
 	// GRPCProtocol is the common-used grpc protocol.

diff --git a/internal/infrastructure/kubernetes/ratelimit/resource.go b/internal/infrastructure/kubernetes/ratelimit/resource.go
@@ -277,6 +277,10 @@ func expectedRateLimitContainerEnv(rateLimit *egv1a1.RateLimit, rateLimitDeploym
 	namespace string,
 ) []corev1.EnvVar {
 	env := []corev1.EnvVar{
+		{
+			Name:  "PROTO",
+			Value: "tcp6",
+		},
 		{
 			Name:  RuntimeRootEnvVar,
 			Value: "/data",

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/custom.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default-env.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -86,7 +88,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         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
@@ -36,6 +36,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -76,7 +78,7 @@ spec:
           value: tcp
         - name: REDIS_URL
           value: redis.redis.svc:6379
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -101,7 +103,7 @@ spec:
           value: "0.6"
         - name: OTEL_EXPORTER_OTLP_ENDPOINT
           value: http://trace-collector.envoy-gateway-system.svc.cluster.local:4317
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -101,7 +103,7 @@ spec:
           value: "1.0"
         - name: OTEL_EXPORTER_OTLP_ENDPOINT
           value: http://trace-collector.envoy-gateway-system.svc.cluster.local:4318
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/extension-env.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml
@@ -42,6 +42,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -88,7 +90,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml
@@ -42,6 +42,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -88,7 +90,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/override-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/override-env.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -86,7 +88,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/redis-tls-settings.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/redis-tls-settings.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/tolerations.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/tolerations.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/volumes.yaml
@@ -41,6 +41,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -86,7 +88,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         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
@@ -40,6 +40,8 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY
@@ -86,7 +88,7 @@ spec:
           value: :19001
         - name: PROMETHEUS_MAPPER_YAML
           value: /etc/statsd-exporter/conf.yaml
-        image: envoyproxy/ratelimit:master
+        image: ghcr.io/zirain-dev/ratelimit:latest
         imagePullPolicy: IfNotPresent
         name: envoy-ratelimit
         ports: