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(connect envoy): set initial_fetch_timeout to wait for initial xDS… into release/1.14.x #17360

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@DanStough
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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

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


Description

Consul updates for #17283. Consul dataplane updates to follow.

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

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/fairly-fluent-drake branch from 64c2aa7 to 305725e Compare May 15, 2023 14:45
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/NET-3917/default-0s-initial_fetch_timeout/fairly-fluent-drake branch from 305725e to 64c2aa7 Compare May 15, 2023 14:45
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@DanStough
Copy link
Contributor

Opened up a manual version here: #17372

@DanStough DanStough closed this May 15, 2023
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