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.

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

Jump to bottom

docs: Fix merge conflicts #17405

Merged
merged 6 commits into from
May 18, 2023
Merged

docs: Fix merge conflicts #17405

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c93e830
no-op commit due to failed cherry-picking
May 12, 2023
441f698
docs: connect-service-upstreams annotation fixes (#17312)
boruszak May 12, 2023
8f0a1e3
Merge branch 'release/1.15.x' into backport/docs/annotations-page-str…
boruszak May 17, 2023
a2f63bb
Merge branch 'release/1.15.x' into backport/docs/annotations-page-str…
boruszak May 17, 2023
6cad4d4
Fix merge conflict
boruszak May 18, 2023
49f176d
Merge branch 'release/1.15.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
14 changes: 0 additions & 14 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 @@ -76,14 +76,6 @@ 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](/consul/docs/k8s/connect/cluster-peering/k8s-tech-specs) 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+):

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 @@ -135,12 +127,6 @@ The following Kubernetes resource annotations could be used on a pod to control
The unlabeled annotation format allows you to reference any service not in a cluster peer as an upstream. You can specify a Consul Enterprise namespace. You can also specify an admin partition in the same datacenter or a WAN-federated datacenter. Unlike the labeled annotation, you can also reference a prepared query as an upstream.

- 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]"
```

- Namespace (requires Consul Enterprise 1.7+): Upstream services may be running in a different namespace. Place
the upstream namespace after the service name. For additional details about configuring the injector, refer to [Consul Enterprise namespaces](#consul-enterprise-namespaces) .
Expand Down