From b068b4128869ba949f67590c2fc78b1e761a38c8 Mon Sep 17 00:00:00 2001 From: Dan Stough Date: Thu, 1 Jun 2023 13:10:41 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(connect=20envoy):=20set=20initial?= =?UTF-8?q?=5Ffetch=5Ftimeout=20to=20wait=20for=20initial=20xDS=E2=80=A6?= =?UTF-8?q?=20(#17317)"=20(#17540)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit be7d2a4d842a8cbab7ce6161e88807a1f0a946b0. --- .changelog/17317.txt | 3 --- command/connect/envoy/bootstrap_tpl.go | 2 -- .../CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden | 2 -- ...HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden | 2 -- command/connect/envoy/testdata/access-log-path.golden | 2 -- .../connect/envoy/testdata/access-logs-enabled-custom.golden | 2 -- command/connect/envoy/testdata/access-logs-enabled.golden | 2 -- command/connect/envoy/testdata/acl-enabled-and-token.golden | 2 -- command/connect/envoy/testdata/acl-enabled-but-no-token.golden | 2 -- ...NSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden | 2 -- ...UL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden | 2 -- command/connect/envoy/testdata/defaults-nodemeta.golden | 2 -- command/connect/envoy/testdata/defaults.golden | 2 -- .../connect/envoy/testdata/deprecated-grpc-addr-config.golden | 2 -- command/connect/envoy/testdata/envoy-readiness-probe.golden | 2 -- command/connect/envoy/testdata/existing-ca-file.golden | 2 -- command/connect/envoy/testdata/existing-ca-path.golden | 2 -- command/connect/envoy/testdata/extra_-multiple.golden | 2 -- command/connect/envoy/testdata/extra_-single.golden | 2 -- command/connect/envoy/testdata/grpc-addr-env.golden | 2 -- command/connect/envoy/testdata/grpc-addr-flag.golden | 2 -- command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden | 2 -- command/connect/envoy/testdata/grpc-addr-unix.golden | 2 -- command/connect/envoy/testdata/grpc-tls-addr-config.golden | 2 -- .../envoy/testdata/ingress-gateway-address-specified.golden | 2 -- .../envoy/testdata/ingress-gateway-no-auto-register.golden | 2 -- command/connect/envoy/testdata/ingress-gateway-nodemeta.golden | 2 -- .../ingress-gateway-register-with-service-and-proxy-id.golden | 2 -- ...gress-gateway-register-with-service-without-proxy-id.golden | 2 -- command/connect/envoy/testdata/ingress-gateway.golden | 2 -- .../envoy/testdata/prometheus-metrics-tls-ca-file.golden | 2 -- .../envoy/testdata/prometheus-metrics-tls-ca-path.golden | 2 -- command/connect/envoy/testdata/prometheus-metrics.golden | 2 -- command/connect/envoy/testdata/stats-config-override.golden | 2 -- command/connect/envoy/testdata/telemetry-collector.golden | 2 -- command/connect/envoy/testdata/token-arg.golden | 2 -- command/connect/envoy/testdata/token-env.golden | 2 -- command/connect/envoy/testdata/token-file-arg.golden | 2 -- command/connect/envoy/testdata/token-file-env.golden | 2 -- command/connect/envoy/testdata/xds-addr-config.golden | 2 -- command/connect/envoy/testdata/zipkin-tracing-config.golden | 2 -- 41 files changed, 83 deletions(-) delete mode 100644 .changelog/17317.txt diff --git a/.changelog/17317.txt b/.changelog/17317.txt deleted file mode 100644 index 76c86a0a2..000000000 --- a/.changelog/17317.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:bug -connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration. -``` diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index 26b8e2118..78d88f9b1 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -281,12 +281,10 @@ const bootstrapTemplate = `{ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden index c8144ac72..a8ba4704f 100644 --- a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden index a89575d2c..5485256b4 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 184a290b2..18a28a491 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/access-logs-enabled-custom.golden b/command/connect/envoy/testdata/access-logs-enabled-custom.golden index 50531f89c..6af720bda 100644 --- a/command/connect/envoy/testdata/access-logs-enabled-custom.golden +++ b/command/connect/envoy/testdata/access-logs-enabled-custom.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/access-logs-enabled.golden b/command/connect/envoy/testdata/access-logs-enabled.golden index ea2e15060..892cf4632 100644 --- a/command/connect/envoy/testdata/access-logs-enabled.golden +++ b/command/connect/envoy/testdata/access-logs-enabled.golden @@ -219,12 +219,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/acl-enabled-and-token.golden b/command/connect/envoy/testdata/acl-enabled-and-token.golden index a5427c7f2..3342f0390 100644 --- a/command/connect/envoy/testdata/acl-enabled-and-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-and-token.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden index a89575d2c..5485256b4 100644 --- a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden index c8144ac72..a8ba4704f 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden index a89575d2c..5485256b4 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/defaults-nodemeta.golden b/command/connect/envoy/testdata/defaults-nodemeta.golden index ea6542110..41788c3c4 100644 --- a/command/connect/envoy/testdata/defaults-nodemeta.golden +++ b/command/connect/envoy/testdata/defaults-nodemeta.golden @@ -185,12 +185,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index a89575d2c..5485256b4 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden index e604c61d5..ab87aa9b4 100644 --- a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden +++ b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/envoy-readiness-probe.golden b/command/connect/envoy/testdata/envoy-readiness-probe.golden index 18680a320..444528e88 100644 --- a/command/connect/envoy/testdata/envoy-readiness-probe.golden +++ b/command/connect/envoy/testdata/envoy-readiness-probe.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index c8144ac72..a8ba4704f 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index c0566ab35..e246dbb32 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 819994f0c..038e65d8d 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -206,12 +206,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index b1fb71997..14b8f0820 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index e604c61d5..ab87aa9b4 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index e604c61d5..ab87aa9b4 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden index 2b902d48d..89764c310 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden @@ -196,12 +196,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 88e6e46bf..eb8841ae9 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -183,12 +183,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/grpc-tls-addr-config.golden b/command/connect/envoy/testdata/grpc-tls-addr-config.golden index e65fc5f09..e79cf0455 100644 --- a/command/connect/envoy/testdata/grpc-tls-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-tls-addr-config.golden @@ -197,12 +197,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index 038c8fcc5..cc2e504ea 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden index 80f1f9a8b..cddaa490d 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden index 8a2d5f627..d79739ed7 100644 --- a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden +++ b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden @@ -274,12 +274,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden index 6192f674a..3149fc4b3 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden index 92d80e033..f8eb44754 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 40a5c74d1..c4fba520e 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden index c93286e64..71b82250e 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden @@ -310,12 +310,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden index 272175f70..07e56ae87 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden @@ -310,12 +310,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index 5806dd671..5adc8a948 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -273,12 +273,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index dd4ff53dd..d2a2371f2 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -62,12 +62,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/telemetry-collector.golden b/command/connect/envoy/testdata/telemetry-collector.golden index 983e51633..7c584864a 100644 --- a/command/connect/envoy/testdata/telemetry-collector.golden +++ b/command/connect/envoy/testdata/telemetry-collector.golden @@ -221,12 +221,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 816bf7487..ac057e9a6 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 816bf7487..ac057e9a6 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 816bf7487..ac057e9a6 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 816bf7487..ac057e9a6 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/xds-addr-config.golden b/command/connect/envoy/testdata/xds-addr-config.golden index e604c61d5..ab87aa9b4 100644 --- a/command/connect/envoy/testdata/xds-addr-config.golden +++ b/command/connect/envoy/testdata/xds-addr-config.golden @@ -184,12 +184,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index dc4779a77..fd52f5ae3 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -217,12 +217,10 @@ "dynamic_resources": { "lds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "cds_config": { "ads": {}, - "initial_fetch_timeout": "0s", "resource_api_version": "V3" }, "ads_config": {