From 698165858505eab8b0df029a9c2b551d891b9c92 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 10 Aug 2023 13:33:01 -0700 Subject: [PATCH] k8s compat - Openshift versions (#18307) * Update compatibility.mdx Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/k8s/compatibility.mdx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/website/content/docs/k8s/compatibility.mdx b/website/content/docs/k8s/compatibility.mdx index 1ad8a365e7..60932c0cb1 100644 --- a/website/content/docs/k8s/compatibility.mdx +++ b/website/content/docs/k8s/compatibility.mdx @@ -13,11 +13,11 @@ For every release of Consul on Kubernetes, a Helm chart, `consul-k8s-control-pla Consul Kubernetes versions all of its components (`consul-k8s` CLI, `consul-k8s-control-plane`, and Helm chart) with a single semantic version. When installing or upgrading to a specific versions, ensure that you are using the correct Consul version with the compatible Helm chart or `consul-k8s` CLI. -| Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions | -| -------------- | -------------------------------- | -------------------------------| -| 1.16.x | 1.2.x | 1.24.x - 1.27.x | -| 1.15.x | 1.1.x | 1.23.x - 1.26.x | -| 1.14.x | 1.0.x | 1.22.x - 1.25.x | +| Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions | Compatible OpenShift versions | +| -------------- | -------------------------------- | -------------------------------| ----------------------------- | +| 1.16.x | 1.2.x | 1.24.x - 1.27.x | 4.11.x - 4.14.x | +| 1.15.x | 1.1.x | 1.23.x - 1.26.x | 4.10.x - 4.13.x | +| 1.14.x | 1.0.x | 1.22.x - 1.25.x | 4.9.x - 4.12.x | ### Version-specific upgrade requirements @@ -41,9 +41,7 @@ Starting with Consul K8s 0.39.0 and Consul 1.11.x, Consul Kubernetes supports th ### Red Hat OpenShift -Consul Kubernetes delivered Red Hat OpenShift support starting with Consul Helm chart version 0.25.0 for Consul 1.8.4. Please note the following details regarding OpenShift support. - -- Red Hat OpenShift is only supported for OpenShift 4.4.x and above. +You can enable support for Red Hat OpenShift by setting `enabled: true` in the `global.openshift` stanza. Refer to the [Deploy Consul on RedHat OpenShift tutorial](https://developer.hashicorp.com/consul/tutorials/kubernetes/kubernetes-openshift-red-hat) for instructions on deploying to OpenShift. - Only the default CNI Plugin, [OpenShift SDN CNI Plugin](https://docs.openshift.com/container-platform/4.9/networking/openshift_sdn/about-openshift-sdn.html) is currently supported. ### VMware Tanzu Kubernetes Grid and Tanzu Kubernetes Grid Integrated Edition