Update docs for consul-k8s 1.1.0 (#16447)

hashicorp · Feb 28, 2023 · afbc566 · afbc566
1 parent a0862e6
commit afbc566
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 112 deletions.
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
@@ -42,19 +42,15 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
 | 1.15.x              | 1.25.1, 1.24.2, 1.23.4, 1.22.5                                                     |
 | 1.14.x              | 1.24.0, 1.23.1, 1.22.5, 1.21.5                                                     |
 | 1.13.x              | 1.23.1, 1.22.5, 1.21.5, 1.20.7                                                     |
-| 1.12.x              | 1.22.5, 1.21.5, 1.20.7, 1.19.5                                                     |
-
-1. Envoy 1.20.1 and earlier are vulnerable to [CVE-2022-21654](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21654) and [CVE-2022-21655](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21655). Both CVEs were patched in Envoy versions 1.18.6, 1.19.3, and 1.20.2.
-Envoy 1.16.x and older releases are no longer supported (see [HCSEC-2022-07](https://discuss.hashicorp.com/t/hcsec-2022-07-consul-s-connect-service-mesh-affected-by-recent-envoy-security-releases/36332)). Consul 1.9.x clusters should be upgraded to 1.10.x and Envoy upgraded to the latest supported Envoy version for that release, 1.18.6.
 
 ### Envoy and Consul Dataplane
 
 Consul Dataplane is a feature introduced in Consul v1.14. Because each version of Consul Dataplane supports one specific version of Envoy, you must use the following versions of Consul, Consul Dataplane, and Envoy together.
 
-| Consul Version      | Consul Dataplane Version | Bundled Envoy Version  |
-| ------------------- | ------------------------ | ---------------------- |
-| 1.15.x              | 1.1.x                    | 1.25.x                 |
-| 1.14.x              | 1.0.x                    | 1.24.x                 |
+| Consul Version      | Consul Dataplane Version (Bundled Envoy Version)  |
+| ------------------- | ------------------------------------------------- |
+| 1.15.x              | 1.1.x (Envoy 1.25.x), 1.0.x (Envoy 1.24.x)        |
+| 1.14.x              | 1.0.x (Envoy 1.24.x)                              |
 
 ## Getting Started
 

diff --git a/website/content/docs/k8s/compatibility.mdx b/website/content/docs/k8s/compatibility.mdx
@@ -15,9 +15,9 @@ Consul Kubernetes versions all of its components (`consul-k8s` CLI, `consul-k8s-
 
 | Consul Version | Compatible consul-k8s Versions   | Compatible Kubernetes Versions | 
 | -------------- | -------------------------------- | -------------------------------|
+| 1.15.x         | 1.1.x                            | 1.23.x - 1.26.x                |
 | 1.14.x         | 1.0.x                            | 1.22.x - 1.25.x                |
 | 1.13.x         | 0.49.x                           | 1.21.x - 1.24.x                |
-| 1.12.x         | 0.43.0 - 0.49.x                  | 1.19.x - 1.22.x                |
 
 ## Supported Envoy versions