From 0a9b224416c578aa8368b91f7c73a74c4163b6f6 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-vault-core <82990506+hc-github-team-secure-vault-core@users.noreply.github.com> Date: Fri, 28 Apr 2023 05:37:56 -0400 Subject: [PATCH] backport of commit 6aeef87531de19695316e60895bba1eac0e346d8 (#20417) Co-authored-by: Tom Proctor --- website/content/docs/platform/k8s/csi/index.mdx | 2 ++ website/content/docs/platform/k8s/helm/index.mdx | 2 ++ .../content/docs/platform/k8s/injector/index.mdx | 15 +-------------- website/content/docs/platform/k8s/vso/index.mdx | 2 ++ .../partials/kubernetes-supported-versions.mdx | 13 +++++++++++++ 5 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 website/content/partials/kubernetes-supported-versions.mdx diff --git a/website/content/docs/platform/k8s/csi/index.mdx b/website/content/docs/platform/k8s/csi/index.mdx index 8bc00e8bf987..ece514f50d48 100644 --- a/website/content/docs/platform/k8s/csi/index.mdx +++ b/website/content/docs/platform/k8s/csi/index.mdx @@ -35,6 +35,8 @@ The following features are supported by the Vault CSI Provider: - Syncing secrets to Kubernetes secrets to be used as environment variables. - Installation via [Vault Helm](/vault/docs/platform/k8s/helm) +@include 'kubernetes-supported-versions.mdx' + ## Authenticating with Vault The primary method of authentication with Vault when using the Vault CSI Provider diff --git a/website/content/docs/platform/k8s/helm/index.mdx b/website/content/docs/platform/k8s/helm/index.mdx index bfbea1118ddc..49daba2a31af 100644 --- a/website/content/docs/platform/k8s/helm/index.mdx +++ b/website/content/docs/platform/k8s/helm/index.mdx @@ -20,6 +20,8 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and how to use it. Using Helm to install Vault requires that Helm is properly installed and configured with your Kubernetes cluster. +@include 'kubernetes-supported-versions.mdx' + ## Using the Helm Chart Helm must be installed and configured on your machine. Please refer to the [Helm diff --git a/website/content/docs/platform/k8s/injector/index.mdx b/website/content/docs/platform/k8s/injector/index.mdx index b50d25b6d2ca..3404f6bc0b34 100644 --- a/website/content/docs/platform/k8s/injector/index.mdx +++ b/website/content/docs/platform/k8s/injector/index.mdx @@ -20,20 +20,7 @@ the request. This functionality is provided by the [vault-k8s](https://github.co project and can be automatically installed and configured using the [Vault Helm](https://github.com/hashicorp/vault-helm) chart. -## Supported Kubernetes Versions - -The following [Kubernetes minor releases][k8s-releases] are currently supported. -The latest version of the injector is tested against each version. It may work -with other versions of Kubernetes, but those are not supported. - -* 1.26 -* 1.25 -* 1.24 -* 1.23 -* 1.22 -* 1.21 - -[k8s-releases]: https://kubernetes.io/releases/ +@include 'kubernetes-supported-versions.mdx' ## Overview diff --git a/website/content/docs/platform/k8s/vso/index.mdx b/website/content/docs/platform/k8s/vso/index.mdx index 032750700bf9..86755b54e1c8 100644 --- a/website/content/docs/platform/k8s/vso/index.mdx +++ b/website/content/docs/platform/k8s/vso/index.mdx @@ -32,6 +32,8 @@ The following features are supported by the Vault Secrets Operator: - Supported installation methods: `Helm`, `Kustomize`
*see the [installation](/vault/docs/platform/k8s/vso/installation) docs for more details* +@include 'kubernetes-supported-versions.mdx' + ## Vault Access and Custom Resource Definitions ~> **Note:** Currently, the Operator only supports the [Kubernetes Auth Method](/vault/docs/auth/kubernetes). diff --git a/website/content/partials/kubernetes-supported-versions.mdx b/website/content/partials/kubernetes-supported-versions.mdx new file mode 100644 index 000000000000..5b5528839c6d --- /dev/null +++ b/website/content/partials/kubernetes-supported-versions.mdx @@ -0,0 +1,13 @@ +## Supported Kubernetes Versions + +The following [Kubernetes minor releases][k8s-releases] are currently supported. +The latest version is tested against each Kubernetes version. It may work with +other versions of Kubernetes, but those are not supported. + +* 1.26 +* 1.25 +* 1.24 +* 1.23 +* 1.22 + +[k8s-releases]: https://kubernetes.io/releases/ \ No newline at end of file