internal/envoy: don't create service_stats cluster if stats disabled

Updates projectcontour#420 If stats are not enabled, there is no point in creating a static stats cluster as it will not be used and generates log spam. Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney · Jul 6, 2018 · 182e145 · 182e145
1 parent cad3ade
commit 182e145
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/internal/envoy/config.go b/internal/envoy/config.go
@@ -108,7 +108,7 @@ static_resources:
           max_pending_requests: 100000
           max_requests: 60000000
           max_retries: 50
-  - name: service_stats
+{{ if .StatsdEnabled }}  - name: service_stats
     connect_timeout: 0.250s
     type: LOGICAL_DNS
     lb_policy: ROUND_ROBIN
@@ -117,7 +117,7 @@ static_resources:
           protocol: TCP
           address: 127.0.0.1
           port_value: {{ if .AdminPort }}{{ .AdminPort }}{{ else }}9001{{ end }}
-{{ if .StatsdEnabled }}  listeners:
+  listeners:
     - address:
         socket_address:
           protocol: TCP

diff --git a/internal/envoy/config_test.go b/internal/envoy/config_test.go
@@ -63,15 +63,6 @@ static_resources:
           max_pending_requests: 100000
           max_requests: 60000000
           max_retries: 50
-  - name: service_stats
-    connect_timeout: 0.250s
-    type: LOGICAL_DNS
-    lb_policy: ROUND_ROBIN
-    hosts:
-      - socket_address:
-          protocol: TCP
-          address: 127.0.0.1
-          port_value: 9001
 admin:
   access_log_path: /dev/null
   address: