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.

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 fix: set initial_fetch_timeout to wait for initial xDS… into release/1.0.x #113

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #104 to be assessed for backporting due to the inclusion of the label backport/1.0.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

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


Description

Consul dataplane 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.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/NET-3917/default-0s-initial_fetch_timeout/luckily-causal-troll branch from 4a79b28 to beb28b3 Compare May 15, 2023 14:44
@hashicorp-cla
Copy link

hashicorp-cla commented May 15, 2023

CLA assistant check
All committers have signed the CLA.

@DanStough DanStough force-pushed the backport/dans/NET-3917/default-0s-initial_fetch_timeout/luckily-causal-troll branch from 22107a2 to 3a6a1b8 Compare May 15, 2023 19:59
@DanStough
Copy link
Contributor

This one needed manual surgery because pkg/consuldp/testdata/TestBootstrapConfig/access-logs.golden doesn't exist on the release/1.0.x branch.

@DanStough DanStough marked this pull request as ready for review May 15, 2023 20:00
@DanStough DanStough requested a review from a team as a code owner May 15, 2023 20:00
Copy link

@malizz malizz left a comment

Choose a reason for hiding this comment

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

LGTM

@DanStough DanStough merged commit dc205ce into release/1.0.x May 16, 2023
@DanStough DanStough deleted the backport/dans/NET-3917/default-0s-initial_fetch_timeout/luckily-causal-troll branch May 16, 2023 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants