diff --git a/website/content/docs/connect/cluster-peering/tech-specs.mdx b/website/content/docs/connect/cluster-peering/tech-specs.mdx index 929a25f924..8fe2794416 100644 --- a/website/content/docs/connect/cluster-peering/tech-specs.mdx +++ b/website/content/docs/connect/cluster-peering/tech-specs.mdx @@ -71,7 +71,7 @@ The Envoy proxies that function as sidecars in your service mesh require configu ## Exported service specifications -The `exported-services` configuration entry is required in order for services to communicate across partitions with cluster peering connections. Basic guidance on using the `exported-services` configuration entry is included in [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-peering#export-services-between-clusters). +The `exported-services` configuration entry is required in order for services to communicate across partitions with cluster peering connections. Basic guidance on using the `exported-services` configuration entry is included in [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#export-services-between-clusters). Refer to the [`exported-services` configuration entry](/consul/docs/connect/config-entries/exported-services) reference for more information. diff --git a/website/content/docs/connect/config-entries/service-resolver.mdx b/website/content/docs/connect/config-entries/service-resolver.mdx index 89147a24af..1136c15cfe 100644 --- a/website/content/docs/connect/config-entries/service-resolver.mdx +++ b/website/content/docs/connect/config-entries/service-resolver.mdx @@ -537,7 +537,7 @@ spec: type: 'string: ""', description: `Specifies the destination cluster peer to resolve the target service name from. - Ensure that [intentions are defined](/consul/docs/connect/cluster-peering/create-manage-peering#authorize-services-for-peers) + Ensure that [intentions are defined](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#authorize-services-for-peers) on the peered cluster to allow the source service to access this redirect target service as an upstream. When the peer name is specified, Consul uses Envoy's outlier detection to determine the health of the redirect target based on whether communication attempts to the @@ -646,7 +646,7 @@ spec: type: 'string: ""', description: `Specifies the destination cluster peer to resolve the target service name from. - Ensure that [intentions are defined](/consul/docs/connect/cluster-peering/create-manage-peering#authorize-services-for-peers) + Ensure that [intentions are defined](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#authorize-services-for-peers) on the peered cluster to allow the source service to access this failover target service as an upstream. When the peer name is specified, Consul uses Envoy's outlier detection to determine the health of the failover target based on diff --git a/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx b/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx index e538a5bc86..b46a18bef2 100644 --- a/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx +++ b/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx @@ -127,9 +127,9 @@ Peeering: ``` -By setting this mesh config on a cluster before [creating a peering token](/consul/docs/connect/cluster-peering/create-manage-peering#create-a-peering-token), inbound control plane traffic will be sent through the mesh gateway registered this cluster, also known the accepting cluster. +By setting this mesh config on a cluster before [creating a peering token](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#create-a-peering-token), inbound control plane traffic will be sent through the mesh gateway registered this cluster, also known the accepting cluster. As mesh gateway instances are registered at the accepting cluster, their addresses will be exposed to the dialing cluster over the bi-directional peering stream. -Setting this mesh config on a cluster before [establishing a connection](/consul/docs/connect/cluster-peering/create-manage-peering#establish-a-connection-between-clusters) will cause the outbound control plane traffic to flow through the mesh gateway. +Setting this mesh config on a cluster before [establishing a connection](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#establish-a-connection-between-clusters) will cause the outbound control plane traffic to flow through the mesh gateway. To route all peering control plane traffic though mesh gateways, both the accepting and dialing cluster must have the mesh config entry applied. diff --git a/website/content/docs/enterprise/admin-partitions.mdx b/website/content/docs/enterprise/admin-partitions.mdx index 180235a0e3..230b3d6015 100644 --- a/website/content/docs/enterprise/admin-partitions.mdx +++ b/website/content/docs/enterprise/admin-partitions.mdx @@ -65,7 +65,7 @@ You can configure services to be discoverable by downstream services in any part ### Cluster Peering -You can use [cluster peering](/consul/docs/connect/cluster-peering/) between two admin partitions to connect clusters owned by different operators. Without Consul Enterprise, cluster peering is limited to the `default` partitions in each datacenter. Enterprise users can [create and manage cluster peering connections](/consul/docs/connect/cluster-peering/create-manage-peering) between any two admin partitions as long as the partitions are in separate datacenters. It is not possible to establish cluster peering connections between two partitions in a single datacenter. +You can use [cluster peering](/consul/docs/connect/cluster-peering/) between two admin partitions to connect clusters owned by different operators. Without Consul Enterprise, cluster peering is limited to the `default` partitions in each datacenter. Enterprise users can [establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering) between any two admin partitions as long as the partitions are in separate datacenters. It is not possible to establish cluster peering connections between two partitions in a single datacenter. To use mesh gateways with admin partitions and cluster peering, refer to [Mesh Gateways between Peered Clusters](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-peers). diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx index b9b263ea4f..91ed197128 100644 --- a/website/content/docs/k8s/helm.mdx +++ b/website/content/docs/k8s/helm.mdx @@ -20,21 +20,26 @@ with Consul. Use these links to navigate to a particular top-level stanza. -- [`global`](#h-global) -- [`server`](#h-server) -- [`externalServers`](#h-externalservers) -- [`client`](#h-client) -- [`dns`](#h-dns) -- [`ui`](#h-ui) -- [`syncCatalog`](#h-synccatalog) -- [`connectInject`](#h-connectinject) -- [`meshGateway`](#h-meshgateway) -- [`ingressGateways`](#h-ingressgateways) -- [`terminatingGateways`](#h-terminatinggateways) -- [`apiGateway`](#h-apigateway) -- [`webhookCertManager`](#h-webhookcertmanager) -- [`prometheus`](#h-prometheus) -- [`tests`](#h-tests) +- [Helm Chart Reference](#helm-chart-reference) + - [Top-Level Stanzas](#top-level-stanzas) + - [All Values](#all-values) + - [global ((#h-global))](#global-h-global) + - [server ((#h-server))](#server-h-server) + - [externalServers ((#h-externalservers))](#externalservers-h-externalservers) + - [client ((#h-client))](#client-h-client) + - [dns ((#h-dns))](#dns-h-dns) + - [ui ((#h-ui))](#ui-h-ui) + - [syncCatalog ((#h-synccatalog))](#synccatalog-h-synccatalog) + - [connectInject ((#h-connectinject))](#connectinject-h-connectinject) + - [meshGateway ((#h-meshgateway))](#meshgateway-h-meshgateway) + - [ingressGateways ((#h-ingressgateways))](#ingressgateways-h-ingressgateways) + - [terminatingGateways ((#h-terminatinggateways))](#terminatinggateways-h-terminatinggateways) + - [apiGateway ((#h-apigateway))](#apigateway-h-apigateway) + - [webhookCertManager ((#h-webhookcertmanager))](#webhookcertmanager-h-webhookcertmanager) + - [prometheus ((#h-prometheus))](#prometheus-h-prometheus) + - [tests ((#h-tests))](#tests-h-tests) + - [Helm Chart Examples](#helm-chart-examples) + - [Customizing the Helm Chart](#customizing-the-helm-chart) ## All Values @@ -299,7 +304,7 @@ Use these links to navigate to a particular top-level stanza. - `enabled` ((#v-global-tls-enabled)) (`boolean: false`) - If true, the Helm chart will enable TLS for Consul servers and clients and all consul-k8s-control-plane components, as well as generate certificate authority (optional) and server and client certificates. - This setting is required for [Cluster Peering](/consul/docs/connect/cluster-peering/k8s). + This setting is required for [cluster peering](/consul/docs/k8s/connect/cluster-peering/tech-specs). - `enableAutoEncrypt` ((#v-global-tls-enableautoencrypt)) (`boolean: false`) - If true, turns on the auto-encrypt feature on clients and servers. It also switches consul-k8s-control-plane components to retrieve the CA from the servers @@ -1911,7 +1916,7 @@ Use these links to navigate to a particular top-level stanza. - `enabled` ((#v-meshgateway-enabled)) (`boolean: false`) - If [mesh gateways](/consul/docs/connect/gateways/mesh-gateway) are enabled, a Deployment will be created that runs gateways and Consul Connect will be configured to use gateways. - This setting is required for [Cluster Peering](/consul/docs/connect/cluster-peering/k8s). + This setting is required for [cluster peering](/consul/docs/k8s/connect/cluster-peering/tech-specs). Requirements: consul 1.6.0+ if using `global.acls.manageSystemACLs``. - `replicas` ((#v-meshgateway-replicas)) (`integer: 1`) - Number of replicas for the Deployment. diff --git a/website/content/docs/release-notes/consul/v1_14_x.mdx b/website/content/docs/release-notes/consul/v1_14_x.mdx index fabfb75a7b..8efbedf61d 100644 --- a/website/content/docs/release-notes/consul/v1_14_x.mdx +++ b/website/content/docs/release-notes/consul/v1_14_x.mdx @@ -13,7 +13,7 @@ description: >- - **Cluster Peering Failover:** Cluster Peering now supports the ability to redirect to services running on cluster peers with service resolvers. More details for configuring failover across peers is provided in the Service Resolver [failover](/consul/docs/connect/config-entries/service-resolver#failover) stanza. - - **Control Plane traffic over Mesh Gateways:** Cluster Peering now supports the establishing peering through Mesh Gateways. More detail on using Mesh Gateways for Cluster Peering are found in [Enabling Peering Control Plane Traffic](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways). Mesh Gateways are used by default for [Cluster Peering on Kubernetes](/consul/docs/connect/cluster-peering/k8s). + - **Control Plane traffic over Mesh Gateways:** Cluster Peering now supports the establishing peering through Mesh Gateways. More detail on using Mesh Gateways for Cluster Peering are found in [Enabling Peering Control Plane Traffic](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways). Mesh Gateways are used by default for [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs). - **Simplified Service Mesh with Consul Dataplane:** Support for a new `consul-dataplane`, a lightweight process for managing Envoy proxies introduced in Consul v1.14.0. Consul Dataplane removes the need to run client agents on every node in a cluster for service discovery and service mesh. Instead, Consul deploys sidecar proxies that provide lower latency, support additional runtimes, and integrate with cloud infrastructure providers. Read more in [Simplified Service Mesh with Consul Dataplane](/consul/docs/connect/dataplane). diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 08d80984f5..7c82853402 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -206,7 +206,7 @@ If you already use gRPC encryption, change the following fields to ensure compat [Cluster peering](/consul/docs/connect/cluster-peering) was released in Consul 1.13 as an experimental feature. In Consul 1.14, cluster peering has been improved and is now considered stable. All experimental peering connections created by 1.13 should be -[deleted](/consul/docs/connect/cluster-peering/create-manage-peering#delete-peering-connections) +[deleted](/consul/docs/connect/cluster-peering/usage/manage-connections#delete-peering-connections) prior to upgrading, as they will no longer be compatible with 1.14. ## Consul 1.13.x