From 68ddfc160313062a923247a98dfba16b307c1b6e Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 1 Mar 2024 13:57:59 -0800 Subject: [PATCH] docs: manual backport of relnotes (#20785) * backport * backport --- .../docs/release-notes/consul-k8s/v1_2_x.mdx | 2 +- .../docs/release-notes/consul-k8s/v1_3_x.mdx | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx b/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx index 7220be5163..3f9ba28083 100644 --- a/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx +++ b/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx @@ -66,7 +66,7 @@ We are pleased to announce the following Consul updates. Consul 1.15.x and 1.14.x are not supported. Please refer to Supported Consul and Kubernetes versions for more detail on choosing the correct consul-k8s version. - Consul 1.16.x. -- Consul Dataplane v1.2.x. Refer to Envoy and Consul Dataplane for details about Consul Dataplane versions and the available packaged Envoy version. +- Consul Dataplane v1.2.x. Refer to [Envoy and Consul Dataplane](/consul/docs/v1.16.x/connect/proxies/envoy#envoy-and-consul-dataplane) for details about Consul Dataplane versions and the available packaged Envoy version. - Kubernetes 1.24.x - 1.27.x - kubectl 1.24.x - 1.27.x - Helm 3.6+ diff --git a/website/content/docs/release-notes/consul-k8s/v1_3_x.mdx b/website/content/docs/release-notes/consul-k8s/v1_3_x.mdx index 094d0c7ebe..2c006fa40b 100644 --- a/website/content/docs/release-notes/consul-k8s/v1_3_x.mdx +++ b/website/content/docs/release-notes/consul-k8s/v1_3_x.mdx @@ -11,23 +11,22 @@ We are pleased to announce the following Consul updates. ## Release highlights -- **Catalog v2:** This release provides the ability to preview Consul's v2 Catalog and Resource API. You must enable this feature. -Catalog v2 supports multi-port application deployments with a single Envoy proxy. Refer to the [v2 Catalog and Resource API](/consul/docs/v1.17.x/k8s/multiport) documentation for more information. +**Catalog v2:** This release provides the ability to preview Consul's v2 Catalog and Resource API. You must enable this feature. +Catalog v2 supports multi-port application deployments with a single Envoy proxy. Refer to the [v2 Catalog and Resource API](/consul/docs/k8s/multiport) documentation for more information. The v1 and v2 catalogs are not cross compatible, and not all Consul features are available within this v2 feature preview. + - The Consul UI must be disabled. It does not support multi-port services or the v2 catalog API in this release. + - HCP Consul does not support multi-port services or the v2 catalog API in this release. + - The v2 API only supports transparent proxy mode where services that have permissions to connect to each other can use Kube DNS to connect. - - The Consul UI must be disabled. It does not support multi-port services or the v2 catalog API in this release. - - HCP Consul does not support multi-port services or the v2 catalog API in this release. - - The v2 API only supports transparent proxy mode where services that have permissions to connect to each other can use Kube DNS to connect. - - The v2 Catalog and Resources API is currently in feature preview for Consul on Kubernetes 1.3.0 and should not be used in production environments. + The v2 Catalog and Resources API is currently in feature preview for Consul on Kubernetes 1.3.0 and should not be used in production environments. ## Supported software Consul 1.15.x and 1.14.x are not supported. Please refer to Supported Consul and Kubernetes versions for more detail on choosing the correct consul-k8s version. - Consul 1.17.x. -- Consul Dataplane v1.3.x. Refer to Envoy and Consul Dataplane for details about Consul Dataplane versions and the available packaged Envoy version. +- Consul Dataplane v1.3.x. Refer to [Envoy and Consul Dataplane](/consul/docs/v1.17.x/connect/proxies/envoy#envoy-and-consul-dataplane) for details about Consul Dataplane versions and the available packaged Envoy version. - Kubernetes 1.24.x - 1.27.x - kubectl 1.24.x - 1.27.x - Helm 3.6+