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 chore: upgrade Consul dependencies to latest into release/1.4.x #3698

Conversation

hc-github-team-consul-core

Backport

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

🚨

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:
@zalimeni
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-k8s/merges: 409 Merge conflict []

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


Changes proposed in this PR

  • Upgrade Consul submodule dependencies to latest release versions (tags)
  • Remove replace directives used in pre-release testing
  • Upgrade local submodule pins for control-plane to latest (required due to proto-public upgrade)

1.4.0 PR: #3696

How I've tested this PR

CI continues to pass

How I expect reviewers to test this PR

👀

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/bump-consul-deps-k8s-1.4.0/noticeably-communal-viper branch 2 times, most recently from a505be2 to d031d6c Compare February 29, 2024 15:17
@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.

@zalimeni
Copy link
Member

Closed in favor of #3703

@zalimeni zalimeni closed this Feb 29, 2024
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.

3 participants