Skip to content

docs: FIx merge conflict #17404

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.

Sign up for GitHub

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

Merged
boruszak merged 4 commits into from
May 18, 2023
Merged

docs: FIx merge conflict #17404

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a414fd0
no-op commit due to failed cherry-picking
May 12, 2023
1303db1
docs: connect-service-upstreams annotation fixes (#17312)
boruszak May 12, 2023
2d5d5e7
Git Head fixes
boruszak May 18, 2023
58494f6
Merge branch 'release/1.14.x' into backport/docs/annotations-page-str…
boruszak May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions website/content/docs/k8s/annotations-and-labels.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,7 @@ The following Kubernetes resource annotations could be used on a pod to control
local port to listen for those connections. When transparent proxy is enabled,
this annotation is optional. This annotation can be either _labeled_ or _unlabeled_. We recommend the labeled format because it has a more consistent syntax and can be used to reference cluster peers as upstreams.

<<<<<<< HEAD
- Unlabeled:
Use the unlabeled annotation format to specify a service name, Consul Enterprise namespaces and partitions, and
datacenters. To use [cluster peering](/docs/connect/cluster-peering/k8s) with upstreams, use the following
labeled format.
- Service name: Place the service name at the beginning of the annotation to specify the upstream service. You can
also append the datacenter where the service is deployed (optional).
=======
- **Labeled** (requires Consul on Kubernetes v0.45.0+):
- **Labeled** (requires Consul on Kubernetes v0.45.0+):

The labeled annotation format allows you to reference any service as an upstream. You can specify a Consul Enterprise namespace. You can also specify an admin partition in the same datacenter, a cluster peer, or a WAN-federated datacenter.

Expand Down Expand Up @@ -133,7 +125,6 @@ The following Kubernetes resource annotations could be used on a pod to control

- Service name: Place the service name at the beginning of the annotation to specify the upstream service. You also have the option to append the WAN federated datacenter where the service is deployed.

>>>>>>> 8dce0ba504 (docs: connect-service-upstreams annotation fixes (#17312))
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams":"[service-name]:[port]:[optional datacenter]"
Expand Down