Skip to content

Backport of docs: Consul DNS views on Kubernetes into release/1.20.x#21828

Merged
boruszak merged 1 commit into
release/1.20.xfrom
backport/docs/dns-views/oddly-special-maggot
Oct 16, 2024
Merged

Backport of docs: Consul DNS views on Kubernetes into release/1.20.x#21828
boruszak merged 1 commit into
release/1.20.xfrom
backport/docs/dns-views/oddly-special-maggot

Conversation

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

Backport

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

🚨

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:
@boruszak
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

This PR updates the Consul v1.20 documentation to support the Consul DNS proxy on Kubernetes deployments.

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

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

@boruszak boruszak marked this pull request as ready for review October 16, 2024 14:11
@boruszak boruszak merged commit e6fe73f into release/1.20.x Oct 16, 2024
@boruszak boruszak deleted the backport/docs/dns-views/oddly-special-maggot branch October 16, 2024 14:13
@zalimeni
Copy link
Copy Markdown
Member

zalimeni commented Oct 16, 2024

@boruszak I don't think the commit that was merged is correct- this backport failed, and the contents of the commit are blank (it's an unrelated commit that was already backported - I think it came into your original PR bc of merging main into the PR but not squashing). Checking https://github.com/hashicorp/consul/blob/release/1.20.x/website/content/docs/k8s/dns/views/enable.mdx (1.20.x) I don't see the docs

I think we'll need to manually backport that PR to release/1.20.x

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