Skip to content

Commit

Permalink
docs: 1.18.x cleanup (#20759)
Browse files Browse the repository at this point in the history
* Update compatibility.mdx
* Update configure.mdx
  • Loading branch information
David Yu authored Mar 1, 2024
1 parent 9979ab8 commit 984ccec
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions website/content/docs/k8s/compatibility.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/k8s/multiport/configure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ 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-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).

Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/release-notes/consul/v1_18_x.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 984ccec

Please sign in to comment.