Skip to content

Backport of fix(connect envoy): set initial_fetch_timeout to wait for initial xDS into release/1.14#17372

Merged
DanStough merged 1 commit into
release/1.14.xfrom
dans/NET-3917/release-1.14/default-0s-initial_fetch_timeout
May 15, 2023
Merged

Backport of fix(connect envoy): set initial_fetch_timeout to wait for initial xDS into release/1.14#17372
DanStough merged 1 commit into
release/1.14.xfrom
dans/NET-3917/release-1.14/default-0s-initial_fetch_timeout

Conversation

@DanStough
Copy link
Copy Markdown
Contributor

This is a manual backport of #17317 .

The below text is copied from the body of the original PR.


Description

Consul updates for #17283.

This changes the time Envoy waits for the initial xDS configuration from the default (15s) to indefinitely. This prevents Envoy from starting with only a partial list of listeners/clusters.

Testing & Reproduction steps

Goldenfile tests have been updated since this affects Envoy's bootstrap configuration.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Copy link
Copy Markdown
Contributor

@wilkermichael wilkermichael left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting that the following files don't exist from https://github.com/hashicorp/consul/pull/17317/files
command/connect/envoy/testdata/access-logs-enabled-custom.golden
command/connect/envoy/testdata/access-logs-enabled.golden
command/connect/envoy/testdata/acl-enabled-and-token.golden
command/connect/envoy/testdata/acl-enabled-but-no-token.golden
command/connect/envoy/testdata/hcp-metrics.golden

Also command/connect/envoy/testdata/access-log-path.golden exists, but I think access logs were added in 1.15+?

@DanStough
Copy link
Copy Markdown
Contributor Author

Yes, for sure the access log changes weren't introduced until 1.15. Spot checking the other files, they also look to be added in later releases.

FWIW the golden files were automatically updated using the -update flag when running the tests.

@DanStough DanStough merged commit 886c2ef into release/1.14.x May 15, 2023
@DanStough DanStough deleted the dans/NET-3917/release-1.14/default-0s-initial_fetch_timeout branch May 15, 2023 19:21
DanStough added a commit that referenced this pull request Jun 1, 2023
…wait for initial xDS into release/1.14 (#17372)"

This reverts commit 886c2ef.
DanStough added a commit that referenced this pull request Jun 1, 2023
…wait for initial xDS into release/1.14 (#17372)" (#17541)

This reverts commit 886c2ef.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport theme/cli Flags and documentation for the CLI interface

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants