Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [OSS] Fix initial_fetch_timeout to wait for all xDS resources into release/1.14.x #18066

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Backport of [OSS] Fix initial_fetch_timeout to wait for all xDS resources into release/1.14.x #18066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8b7468
fix(connect): set initial_fetch_time to wait indefinitely
DanStough Jul 5, 2023
e530515
changelog
DanStough Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/18024.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
```
9 changes: 8 additions & 1 deletion agent/proxycfg/ingress_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,19 @@ func (s *handlerIngressGateway) handleUpdate(ctx context.Context, u UpdateEvent,
if !ok {
return fmt.Errorf("invalid type for response: %T", u.Result)
}

// We set this even if the response is empty so that we know the watch is set,
// but we don't block if the ingress config entry is unset for this gateway
snap.IngressGateway.GatewayConfigLoaded = true

if resp.Entry == nil {
return nil
}
gatewayConf, ok := resp.Entry.(*structs.IngressGatewayConfigEntry)
if !ok {
return fmt.Errorf("invalid type for config entry: %T", resp.Entry)
}

snap.IngressGateway.GatewayConfigLoaded = true
snap.IngressGateway.TLSConfig = gatewayConf.TLS
if gatewayConf.Defaults != nil {
snap.IngressGateway.Defaults = *gatewayConf.Defaults
Expand Down
15 changes: 13 additions & 2 deletions agent/proxycfg/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,18 @@ func (c *configSnapshotIngressGateway) isEmpty() bool {
!c.MeshConfigSet
}

// valid tests for two valid ingress snapshot states:
// 1. waiting: the watch on ingress config entries is set, but none were received
// 2. loaded: both the ingress config entry AND the leaf cert are set
func (c *configSnapshotIngressGateway) valid() bool {
waiting := c.GatewayConfigLoaded && len(c.Upstreams) == 0 && c.Leaf == nil

// If we have a leaf, it implies we successfully watched parent resources
loaded := c.GatewayConfigLoaded && c.Leaf != nil

return waiting || loaded
}

type IngressListenerKey struct {
Protocol string
Port int
Expand Down Expand Up @@ -769,8 +781,7 @@ func (s *ConfigSnapshot) Valid() bool {

case structs.ServiceKindIngressGateway:
return s.Roots != nil &&
s.IngressGateway.Leaf != nil &&
s.IngressGateway.GatewayConfigLoaded &&
s.IngressGateway.valid() &&
s.IngressGateway.HostsSet &&
s.IngressGateway.MeshConfigSet
default:
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/bootstrap_tpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,12 @@ 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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions ...connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/access-log-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions ...connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions ...nnect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/defaults-nodemeta.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/defaults.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/envoy-readiness-probe.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/existing-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/existing-ca-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/extra_-multiple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/extra_-single.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/grpc-addr-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/grpc-addr-flag.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/grpc-addr-unix.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/grpc-tls-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway-address-specified.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/ingress-gateway.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@
"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": {
Expand Down
2 changes: 2 additions & 0 deletions command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,12 @@
"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": {
Expand Down
Loading