fix ratelimit statsd not working (envoyproxy#4073)

fix ratelimit statd not working Signed-off-by: zirain <zirain2009@gmail.com>
arkodg · Aug 19, 2024 · 6ab6482 · 6ab6482
1 parent ae6630a
commit 6ab6482
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 11 deletions.
diff --git a/internal/infrastructure/kubernetes/ratelimit/resource.go b/internal/infrastructure/kubernetes/ratelimit/resource.go
@@ -329,7 +329,11 @@ func expectedRateLimitContainerEnv(rateLimit *egv1a1.RateLimit, rateLimitDeploym
 		},
 		{
 			Name:  UseStatsdEnvVar,
-			Value: "false",
+			Value: "true",
+		},
+		{
+			Name:  "STATSD_PORT",
+			Value: "9125",
 		},
 		{
 			Name:  ConfigTypeEnvVar,

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/custom.yaml
@@ -50,7 +50,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default-env.yaml
@@ -50,7 +50,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml
@@ -47,7 +47,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/extension-env.yaml
@@ -50,7 +50,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/override-env.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/override-env.yaml
@@ -51,6 +51,8 @@ spec:
           value: info
         - name: USE_STATSD
           value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/redis-tls-settings.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/redis-tls-settings.yaml
@@ -51,6 +51,8 @@ spec:
           value: info
         - name: USE_STATSD
           value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/tolerations.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/tolerations.yaml
@@ -51,6 +51,8 @@ spec:
           value: info
         - name: USE_STATSD
           value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/volumes.yaml
@@ -51,6 +51,8 @@ spec:
           value: info
         - name: USE_STATSD
           value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL

diff --git a/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml b/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml
@@ -51,7 +51,9 @@ spec:
         - name: LOG_LEVEL
           value: info
         - name: USE_STATSD
-          value: "false"
+          value: "true"
+        - name: STATSD_PORT
+          value: "9125"
         - name: CONFIG_TYPE
           value: GRPC_XDS_SOTW
         - name: CONFIG_GRPC_XDS_SERVER_URL