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

* fix(connect envoy): set initial_fetch_timeout to wait for initial xDS indefinitely

---------

Co-authored-by: Kiril Angov <kiril.angov@gmail.com>
This commit is contained in:
Dan Stough 2023-05-15 10:45:16 -04:00 committed by GitHub
parent abeccb4c76
commit be7d2a4d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 83 additions and 0 deletions

3
.changelog/17317.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration.
```

View File

@ -281,10 +281,12 @@ 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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -219,10 +219,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -185,10 +185,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -206,10 +206,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -196,10 +196,12 @@
"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": {

View File

@ -183,10 +183,12 @@
"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": {

View File

@ -197,10 +197,12 @@
"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": {

View File

@ -221,10 +221,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -274,10 +274,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -310,10 +310,12 @@
"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": {

View File

@ -310,10 +310,12 @@
"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": {

View File

@ -273,10 +273,12 @@
"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": {

View File

@ -62,10 +62,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -184,10 +184,12 @@
"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": {

View File

@ -217,10 +217,12 @@
"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": {