Skip to content

Backport of Add new fields to HCP bootstrap config request and push state request into release/1.15.x#17340

Closed
hc-github-team-consul-core wants to merge 6 commits intorelease/1.15.xfrom
backport/hans/add_new_field_to_bootstrap_config_and_push_state/sadly-eminent-man
Closed

Backport of Add new fields to HCP bootstrap config request and push state request into release/1.15.x#17340
hc-github-team-consul-core wants to merge 6 commits intorelease/1.15.xfrom
backport/hans/add_new_field_to_bootstrap_config_and_push_state/sadly-eminent-man

Conversation

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

Backport

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

🚨

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:
@freddygv
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: unable to process merge commit: "648deb6b01022bdf8cfe7ed393516e2f3678b265", automatic backport requires rebase workflow

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


Description

To support linking cluster, HCP needs to know the datacenter and if ACLs are enabled. Otherwise hosted Consul Core UI won't work properly.

Testing & Reproduction steps

Links

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/hans/add_new_field_to_bootstrap_config_and_push_state/sadly-eminent-man branch from 5ecb7f7 to 1af79cc Compare May 13, 2023 03:02
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/hans/add_new_field_to_bootstrap_config_and_push_state/sadly-eminent-man branch from ef5ea3f to 565ff79 Compare May 13, 2023 03:02
Copy link
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 added the pr/dependencies PR specifically updates dependencies of project label May 13, 2023
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 13, 2023 03:06 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 13, 2023 03:12 Inactive
@github-actions github-actions bot deleted the backport/hans/add_new_field_to_bootstrap_config_and_push_state/sadly-eminent-man branch August 29, 2025 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants