From ea31ffadae8f0d3c0105eb7cd3dff8cb9ad96fdd Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 28 Feb 2024 15:34:22 -0800 Subject: [PATCH 1/4] Update compatibility.mdx --- website/content/docs/k8s/compatibility.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/docs/k8s/compatibility.mdx b/website/content/docs/k8s/compatibility.mdx index 138ad78ac6ce..4d7501c6dcbe 100644 --- a/website/content/docs/k8s/compatibility.mdx +++ b/website/content/docs/k8s/compatibility.mdx @@ -29,8 +29,8 @@ apply to both Consul Enterprise and Consul community edition (CE). | Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions | Compatible OpenShift versions | | -------------- | -------------------------------- | -------------------------------| -------------------------------------- | -| 1.18.x CE | 1.4.x | 1.26.x - 1.29.x | 4.12.x - 4.14.x (4.15.x not available) | -| 1.17.x | 1.3.x | 1.25.x - 1.28.x | 4.12.x - 4.14.x (4.15.x not available) | +| 1.18.x CE | 1.4.x | 1.26.x - 1.29.x | 4.12.x - 4.15.x (4.16.x not available) | +| 1.17.x | 1.3.x | 1.25.x - 1.28.x | 4.12.x - 4.15.x | | 1.16.x | 1.2.x | 1.24.x - 1.27.x | 4.11.x - 4.14.x | #### Enterprise Long Term Support releases @@ -42,8 +42,8 @@ until the LTS release reaches its end of maintenance. | Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions | Compatible OpenShift versions | | -------------- | -------------------------------- | -------------------------------| -------------------------------------- | -| 1.18.x Ent | 1.4.x | 1.26.x - 1.29.x | 4.12.x - 4.14.x (4.15.x not available) | -| 1.15.x Ent | 1.1.x | 1.23.x - 1.28.x | 4.10.x - 4.14.x (4.15.x not available) | +| 1.18.x Ent | 1.4.x | 1.26.x - 1.29.x | 4.12.x - 4.15.x (4.16.x not available) | +| 1.15.x Ent | 1.1.x | 1.23.x - 1.28.x | 4.10.x - 4.15.x | ### Version-specific upgrade requirements From 726b2db1b11c1bd35c45efbbc5acfff5a2404dd0 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 28 Feb 2024 15:39:12 -0800 Subject: [PATCH 2/4] Update configure.mdx typo --- website/content/docs/k8s/multiport/configure.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/k8s/multiport/configure.mdx b/website/content/docs/k8s/multiport/configure.mdx index de6cc0a89e54..e502a322cba9 100644 --- a/website/content/docs/k8s/multiport/configure.mdx +++ b/website/content/docs/k8s/multiport/configure.mdx @@ -30,7 +30,7 @@ Consul deployments that use the v2 catalog enabled must meet the following minim - Consul v1.18.0 - `consul-k8s` CLI v1.4.0 or `hashicorp/consul` Helm chart release v1.4.0 -- `consul-dataplanes` v1.3.0 +- `consul-dataplane` v1.4.0 To install or update the `consul-k8s CLI`, refer to [install the latest version](/consul/docs/k8s/installation/install-cli#install-the-latest-version) or [upgrade the CLI](/consul/docs/k8s/upgrade/upgrade-cli#upgrade-the-cli). From da2a91b57ea184b9e94ec6127bbc8cecccc9c7c4 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 28 Feb 2024 18:17:13 -0800 Subject: [PATCH 3/4] Update v1_18_x.mdx --- website/content/docs/release-notes/consul/v1_18_x.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/release-notes/consul/v1_18_x.mdx b/website/content/docs/release-notes/consul/v1_18_x.mdx index 2245ad386774..33866bdc12e4 100644 --- a/website/content/docs/release-notes/consul/v1_18_x.mdx +++ b/website/content/docs/release-notes/consul/v1_18_x.mdx @@ -37,7 +37,7 @@ We are pleased to announce the following Consul updates. Refer to [transparent proxy overview](/consul/docs/k8s/connect/transparent-proxy) and [Consul on ECS overview](/consul/docs/ecs) for more information. -- **Downgrade from Consul Enterprise to Consul Community Edition**: Consul now provides the ability for enterprise users to migrate their deployments to Community edition and disable enterprise features for business continuity. Refer to [Downgrade from Consul Enterprise to the community edition](/consul/docs/v1.18.x/enterprise/ent-to-ce-downgrades) for more information. +- **Downgrade from Consul Enterprise to Consul Community Edition**: Consul now provides the ability for enterprise users to migrate their deployments to Community edition and disable enterprise features for business continuity. Refer to [Downgrade from Consul Enterprise to the community edition](/consul/docs/enterprise/ent-to-ce-downgrades) for more information. ## Upgrading From 28c5f422f6998159da4d6c22381ede99d4e4e83f Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 28 Feb 2024 18:17:54 -0800 Subject: [PATCH 4/4] Update configure.mdx --- website/content/docs/k8s/multiport/configure.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/k8s/multiport/configure.mdx b/website/content/docs/k8s/multiport/configure.mdx index e502a322cba9..e8fd916468e7 100644 --- a/website/content/docs/k8s/multiport/configure.mdx +++ b/website/content/docs/k8s/multiport/configure.mdx @@ -28,7 +28,7 @@ Registering multi-port services with Consul requires Kubernetes. Multi-port serv Consul deployments that use the v2 catalog enabled must meet the following minimum version requirements: -- Consul v1.18.0 +- `consul` v1.18.0 - `consul-k8s` CLI v1.4.0 or `hashicorp/consul` Helm chart release v1.4.0 - `consul-dataplane` v1.4.0