Skip to content

Commit

Permalink
backport of commit 6aeef87 (#20417)
Browse files Browse the repository at this point in the history
Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com>
  • Loading branch information
hc-github-team-secure-vault-core and tomhjp authored Apr 28, 2023
1 parent 130ce6d commit 0a9b224
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
2 changes: 2 additions & 0 deletions website/content/docs/platform/k8s/csi/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions website/content/docs/platform/k8s/helm/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 1 addition & 14 deletions website/content/docs/platform/k8s/injector/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions website/content/docs/platform/k8s/vso/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ The following features are supported by the Vault Secrets Operator:
- Supported installation methods: `Helm`, `Kustomize`<br />
*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).
Expand Down
13 changes: 13 additions & 0 deletions website/content/partials/kubernetes-supported-versions.mdx
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 0a9b224

Please sign in to comment.