Skip to content

Backport of Update HCP bootstrapping to support existing clusters into release/1.14.x#17174

Closed
hc-github-team-consul-core wants to merge 2 commits into
release/1.14.xfrom
backport/cc-4716-link-existing-clusters/hopelessly-full-koi
Closed

Backport of Update HCP bootstrapping to support existing clusters into release/1.14.x#17174
hc-github-team-consul-core wants to merge 2 commits into
release/1.14.xfrom
backport/cc-4716-link-existing-clusters/hopelessly-full-koi

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

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

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

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.


Replaces #16788

Description

We want to allow users to link Consul clusters that already exist to
HCP. Existing clusters need care when bootstrapped by HCP, since we do
not want to do things like change ACL/TLS settings for a running
cluster.

The plan is to only send down a management token to existing clusters
and nothing else (at least initially).

This PR adds a few commits to that end:

  • Add an HCP management token to server config so that it can be persisted
    through Raft as we do for the initial management token.
  • Update the HCP SDK to be able to receive this new management token.
  • Update the bootstrapping logic to account for the different types of
    clusters that are going to be supported.

Best reviewed by commit

Testing & Reproduction steps

  • Unit tests

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

TODO

  • Manual testing

Overview of commits

@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Apr 27, 2023

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


1 out of 2 committers have signed the CLA.

  • hanshasselberg
  • temp

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
Copy Markdown
Collaborator

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

@github-actions github-actions Bot deleted the backport/cc-4716-link-existing-clusters/hopelessly-full-koi branch August 29, 2025 06:07
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