Skip to content

Backport of docs - add service sync annotations and k8s service weight annotation into release/1.14.x#18038

Merged
david-yu merged 2 commits intorelease/1.14.xfrom
backport/docs/service-weights/optionally-key-ferret
Jul 6, 2023
Merged

Backport of docs - add service sync annotations and k8s service weight annotation into release/1.14.x#18038
david-yu merged 2 commits intorelease/1.14.xfrom
backport/docs/service-weights/optionally-key-ferret

Conversation

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

Backport

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

🚨

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:
@david-yu
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

Docs for hashicorp/consul-k8s#2293 and also adding new section for Service Sync in the annotations page.

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/docs/service-weights/optionally-key-ferret branch from 8075e7f to 0c9f2ed Compare July 6, 2023 20:24
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/service-weights/optionally-key-ferret branch from 0c9f2ed to 8075e7f Compare July 6, 2023 20:24
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jul 6, 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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 6, 2023 20:28 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 6, 2023 20:34 Inactive
@david-yu david-yu marked this pull request as ready for review July 6, 2023 20:36
@david-yu david-yu requested a review from a team as a code owner July 6, 2023 20:36
@david-yu david-yu enabled auto-merge (squash) July 6, 2023 20:36
@david-yu david-yu merged commit 0c4b6d7 into release/1.14.x Jul 6, 2023
@david-yu david-yu deleted the backport/docs/service-weights/optionally-key-ferret branch July 6, 2023 20:45
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.

3 participants