fix listen bug on ipv6

Signed-off-by: zirain <zirain2009@gmail.com>
envoyproxy · Oct 29, 2024 · a1610aa · a1610aa
1 parent 084e9d0
commit a1610aa
Show file tree

Hide file tree

Showing 18 changed files with 100 additions and 0 deletions.
diff --git a/examples/redis/redis.yaml b/examples/redis/redis.yaml
@@ -60,6 +60,10 @@ data:
     kind: EnvoyGateway
     provider:
       type: Kubernetes
+      kubernetes:
+        rateLimitDeployment:
+          container:
+            image: ghcr.io/zirain-dev/ratelimit:latest  # remove this line when upstream PR merged
     gateway:
       controllerName: gateway.envoyproxy.io/gatewayclass-controller
     extensionApis:

diff --git a/internal/infrastructure/kubernetes/ratelimit/resource.go b/internal/infrastructure/kubernetes/ratelimit/resource.go
@@ -277,6 +277,22 @@ func expectedRateLimitContainerEnv(rateLimit *egv1a1.RateLimit, rateLimitDeploym
 	namespace string,
 ) []corev1.EnvVar {
 	env := []corev1.EnvVar{
+		{
+			Name:  "PROTO",
+			Value: "tcp6",
+		},
+		{
+			Name:  "HOST",
+			Value: "",
+		},
+		{
+			Name:  "DEBUG_HOST",
+			Value: "",
+		},
+		{
+			Name:  "GRPC_HOST",
+			Value: "",
+		},
 		{
 			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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - 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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY

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,11 @@ spec:
       - command:
         - /bin/ratelimit
         env:
+        - name: PROTO
+          value: tcp6
+        - name: HOST
+        - name: DEBUG_HOST
+        - name: GRPC_HOST
         - name: RUNTIME_ROOT
           value: /data
         - name: RUNTIME_SUBDIRECTORY