luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "fix(connect envoy): set initial_fetch_timeout to wait for initial xDS… (#17317)" (#17540) 

This reverts commit be7d2a4d842a8cbab7ce6161e88807a1f0a946b0.
This commit is contained in:
Dan Stough 2023-06-01 13:10:41 -04:00 committed by GitHub
parent c448359677
commit b068b41288
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/17317.txt
View File

@ -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.
```

2
command/connect/envoy/bootstrap_tpl.go
View File

@ -281,12 +281,10 @@ const bootstrapTemplate = `{
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/access-log-path.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/access-logs-enabled-custom.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/access-logs-enabled.golden vendored
View File

@ -219,12 +219,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/acl-enabled-and-token.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/acl-enabled-but-no-token.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/defaults-nodemeta.golden vendored
View File

@ -185,12 +185,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/defaults.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/deprecated-grpc-addr-config.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/envoy-readiness-probe.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/existing-ca-file.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/existing-ca-path.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/extra_-multiple.golden vendored
View File

@ -206,12 +206,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/extra_-single.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/grpc-addr-env.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/grpc-addr-flag.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden vendored
View File

@ -196,12 +196,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/grpc-addr-unix.golden vendored
View File

@ -183,12 +183,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/grpc-tls-addr-config.golden vendored
View File

@ -197,12 +197,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway-address-specified.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway-nodemeta.golden vendored
View File

@ -274,12 +274,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/ingress-gateway.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden vendored
View File

@ -310,12 +310,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden vendored
View File

@ -310,12 +310,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/prometheus-metrics.golden vendored
View File

@ -273,12 +273,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/stats-config-override.golden vendored
View File

@ -62,12 +62,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/telemetry-collector.golden vendored
View File

@ -221,12 +221,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/token-arg.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/token-env.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/token-file-arg.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/token-file-env.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/xds-addr-config.golden vendored
View File

@ -184,12 +184,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {

2
command/connect/envoy/testdata/zipkin-tracing-config.golden vendored
View File

@ -217,12 +217,10 @@
"dynamic_resources": { "dynamic_resources": {
"lds_config": { "lds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"cds_config": { "cds_config": {
"ads": {}, "ads": {},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3" "resource_api_version": "V3"
}, },
"ads_config": { "ads_config": {