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 docs: Consul on Kubernetes specific upgrade info into release/1.15.x #18286

Conversation

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

Backport

This PR is auto-generated from #18230 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:
@im2nguyen
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: "034d4626b2eaf11217b5cfdfbc735bd085869905", automatic backport requires rebase workflow

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


Description

These updates address version-specific upgrade information for Consul on Kubernetes. This information already existed within the docs, so these edits make this information more visible on pages related to upgrading the version of consul-k8s.

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/docs/consul-k8s-versions-clarifications/presently-useful-cowbird branch from 89d9fb4 to 7b61034 Compare July 26, 2023 14:03
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jul 26, 2023
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

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

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@im2nguyen im2nguyen marked this pull request as ready for review July 26, 2023 14:05
@im2nguyen im2nguyen requested a review from a team as a code owner July 26, 2023 14:05
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 26, 2023 14:10 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 26, 2023 14:13 Inactive
@david-yu david-yu merged commit a359d25 into release/1.15.x Jul 26, 2023
@david-yu david-yu deleted the backport/docs/consul-k8s-versions-clarifications/presently-useful-cowbird branch July 26, 2023 21:28
@jira jira bot mentioned this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants