github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

* fix(connect): set initial_fetch_time to wait indefinitely

* changelog

---------

Co-authored-by: DanStough <dan.stough@hashicorp.com>
pull/18090/head
hc-github-team-consul-core 1 year ago committed by GitHub
parent
6b0bb57570
commit
148a79fe93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 94 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .changelog/18024.txt
  2. 9
      agent/proxycfg/ingress_gateway.go
  3. 15
      agent/proxycfg/snapshot.go
  4. 2
      command/connect/envoy/bootstrap_tpl.go
  5. 2
      command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden
  6. 2
      command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden
  7. 2
      command/connect/envoy/testdata/access-log-path.golden
  8. 2
      command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden
  9. 2
      command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden
  10. 2
      command/connect/envoy/testdata/defaults-nodemeta.golden
  11. 2
      command/connect/envoy/testdata/defaults.golden
  12. 2
      command/connect/envoy/testdata/deprecated-grpc-addr-config.golden
  13. 2
      command/connect/envoy/testdata/envoy-readiness-probe.golden
  14. 2
      command/connect/envoy/testdata/existing-ca-file.golden
  15. 2
      command/connect/envoy/testdata/existing-ca-path.golden
  16. 2
      command/connect/envoy/testdata/extra_-multiple.golden
  17. 2
      command/connect/envoy/testdata/extra_-single.golden
  18. 2
      command/connect/envoy/testdata/grpc-addr-env.golden
  19. 2
      command/connect/envoy/testdata/grpc-addr-flag.golden
  20. 2
      command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden
  21. 2
      command/connect/envoy/testdata/grpc-addr-unix.golden
  22. 2
      command/connect/envoy/testdata/grpc-tls-addr-config.golden
  23. 2
      command/connect/envoy/testdata/ingress-gateway-address-specified.golden
  24. 2
      command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
  25. 2
      command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
  26. 2
      command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
  27. 2
      command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
  28. 2
      command/connect/envoy/testdata/ingress-gateway.golden
  29. 2
      command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
  30. 2
      command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
  31. 2
      command/connect/envoy/testdata/prometheus-metrics.golden
  32. 2
      command/connect/envoy/testdata/stats-config-override.golden
  33. 2
      command/connect/envoy/testdata/token-arg.golden
  34. 2
      command/connect/envoy/testdata/token-env.golden
  35. 2
      command/connect/envoy/testdata/token-file-arg.golden
  36. 2
      command/connect/envoy/testdata/token-file-env.golden
  37. 2
      command/connect/envoy/testdata/xds-addr-config.golden
  38. 2
      command/connect/envoy/testdata/zipkin-tracing-config.golden

3
.changelog/18024.txt
Unescape 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.
```

9
agent/proxycfg/ingress_gateway.go
Unescape View File

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

15
agent/proxycfg/snapshot.go
Unescape View File

@ -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
@ -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:

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

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

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

@ -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": {

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

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

Write Preview
Loading…
Cancel
Save