Skip to content

Commit

Permalink
backport of commit 14364ab
Browse files Browse the repository at this point in the history
  • Loading branch information
trujillo-adam committed Mar 3, 2023
1 parent 004c7bb commit 23954c0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ This topic describes how to configure Consul API Gateway to route traffic to ser
1. Consul 1.14 or later
1. Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
1. Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/api-gateway/install) for details.
1. A peering connection must already be established between Consul clusters. Refer to [Cluster Peering on Kubernetes](/consul/docs/connect/cluster-peering/k8s) for instructions.
1. The Consul service that you want to route traffic to must be exported to the cluster containing your `Gateway`. Refer to [Cluster Peering on Kubernetes](/consul/docs/connect/cluster-peering/k8s) for instructions.
1. A peering connection must already be established between Consul clusters. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
1. The Consul service that you want to route traffic to must be exported to the cluster containing your `Gateway`. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
1. A `ServiceResolver` for the Consul service you want to route traffic to must be created in the cluster that contains your `Gateway`. Refer to [Service Resolver Configuration Entry](/consul/docs/connect/config-entries/service-resolver) for instructions.

## Configuration
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/k8s/annotations-and-labels.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ The following Kubernetes resource annotations could be used on a pod to control

- Unlabeled:
Use the unlabeled annotation format to specify a service name, Consul Enterprise namespaces and partitions, and
datacenters. To use [cluster peering](/consul/docs/connect/cluster-peering/k8s) with upstreams, use the following
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).
Expand All @@ -98,7 +98,7 @@ The following Kubernetes resource annotations could be used on a pod to control
- Admin partitions (requires Consul Enterprise 1.11+): Upstream services may be running in a different
partition. You must specify the namespace when specifying a partition. Place the partition name after the namespace. If you specify the name of the datacenter (optional), it must be the local datacenter. Communicating across partitions using this method is only supported within a
datacenter. For cross partition communication across datacenters, refer to [cluster
peering](/consul/docs/connect/cluster-peering/k8s).
peering](/consul/docs/k8s/connect/cluster-peering/k8s-tech-specs).
```yaml
annotations:
"consul.hashicorp.com/connect-service-upstreams":"[service-name].[service-namespace].[service-partition]:[port]:[optional datacenter]"
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/k8s/crds/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ You can specify the following values in the `kind` field. Click on a configurati

- [`Mesh`](/consul/docs/connect/config-entries/mesh)
- [`ExportedServices`](/consul/docs/connect/config-entries/exported-services)
- [`PeeringAcceptor`](/consul/docs/connect/cluster-peering/k8s#peeringacceptor)
- [`PeeringDialer`](/consul/docs/connect/cluster-peering/k8s#peeringdialer)
- [`PeeringAcceptor`](/consul/docs/k8s/connect/cluster-peering/tech-specs#peeringacceptor)
- [`PeeringDialer`](/consul/docs/k8s/connect/cluster-peering/tech-specs#peeringdialer)
- [`ProxyDefaults`](/consul/docs/connect/config-entries/proxy-defaults)
- [`ServiceDefaults`](/consul/docs/connect/config-entries/service-defaults)
- [`ServiceSplitter`](/consul/docs/connect/config-entries/service-splitter)
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/release-notes/consul-k8s/v0_47_x.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description: >-

## Release Highlights

- **Cluster Peering (Beta)**: This release introduces support for Cluster Peering, which allows service connectivity between two independent clusters. Enabling peering will deploy the peering controllers and PeeringAcceptor and PeeringDialer CRDs. The new CRDs are used to establish a peering connection between two clusters. Refer to [Cluster Peering on Kubernetes](/consul/docs/connect/cluster-peering/k8s) for full instructions on using Cluster Peering on Kubernetes.
- **Cluster Peering (Beta)**: This release introduces support for cluster peering, which allows service connectivity between two independent clusters. When you enable cluster peering, Consul deploys the peering controllers and `PeeringAcceptor` and `PeeringDialer` CRDs. The new CRDs are used to establish a peering connection between two clusters. Refer to [Cluster Peering Overview](/consul/docs/connect/cluster-peering) for full instructions on using Cluster Peering on Kubernetes.

- **Envoy Proxy Debugging CLI Commands**: This release introduces new commands to quickly identify proxies and troubleshoot Envoy proxies for sidecars and gateways.
* Add `consul-k8s proxy list` command for displaying pods running Envoy managed by Consul.
Expand Down
2 changes: 1 addition & 1 deletion website/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = [
},
{
source: '/consul/docs/connect/cluster-peering/k8s',
destination: '/consul/docs/k8s/connect/cluster-peering/k8s-tech-specs',
destination: '/consul/docs/k8s/connect/cluster-peering/tech-specs',
permanent: true,
},
]

0 comments on commit 23954c0

Please sign in to comment.