From 23be7aa02b0fd68aa3edb3b656273b5c98362848 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 6 Aug 2019 21:18:39 +0200 Subject: [PATCH 1/2] storage: CSI inline volumes in beta --- content/en/docs/concepts/storage/volumes.md | 5 ++++- .../reference/command-line-tools-reference/feature-gates.md | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/en/docs/concepts/storage/volumes.md b/content/en/docs/concepts/storage/volumes.md index b92d4ff12ebd3..212db455927a4 100644 --- a/content/en/docs/concepts/storage/volumes.md +++ b/content/en/docs/concepts/storage/volumes.md @@ -1316,6 +1316,7 @@ Learn how to #### CSI ephemeral volumes {{< feature-state for_k8s_version="v1.15" state="alpha" >}} +{{< feature-state for_k8s_version="v1.16" state="beta" >}} This feature allows CSI volumes to be directly embedded in the Pod specification instead of a PersistentVolume. Volumes specified in this way are ephemeral and do not persist across Pod restarts. @@ -1342,7 +1343,9 @@ spec: foo: bar ``` -This feature requires CSIInlineVolume feature gate to be enabled: +This feature requires CSIInlineVolume feature gate to be enabled. It +is enabled by default in Kubernetes >= 1.16. In Kubernetes v1.15, it +has to be enabled explicitly: ``` --feature-gates=CSIInlineVolume=true diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates.md b/content/en/docs/reference/command-line-tools-reference/feature-gates.md index b68056c516a7f..660caece1f865 100644 --- a/content/en/docs/reference/command-line-tools-reference/feature-gates.md +++ b/content/en/docs/reference/command-line-tools-reference/feature-gates.md @@ -58,7 +58,8 @@ different Kubernetes components. | `CSIBlockVolume` | `true` | Beta | 1.14 | | | `CSIDriverRegistry` | `false` | Alpha | 1.12 | 1.13 | | `CSIDriverRegistry` | `true` | Beta | 1.14 | | -| `CSIInlineVolume` | `false` | Alpha | 1.15 | - | +| `CSIInlineVolume` | `false` | Alpha | 1.15 | 1.15 | +| `CSIInlineVolume` | `true` | Beta | 1.16 | - | | `CSIMigration` | `false` | Alpha | 1.14 | | | `CSIMigrationAWS` | `false` | Alpha | 1.14 | | | `CSIMigrationAzureDisk` | `false` | Alpha | 1.15 | | From 5db933ecfb19c1d18bb41259a055c1735976b2c2 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 9 Sep 2019 08:15:53 +0200 Subject: [PATCH 2/2] storage: remove historic information for CSI inline volumes As pointed out during review, this information is better captured in the feature gates reference page. --- content/en/docs/concepts/storage/volumes.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/content/en/docs/concepts/storage/volumes.md b/content/en/docs/concepts/storage/volumes.md index 212db455927a4..2e8f4a0d98748 100644 --- a/content/en/docs/concepts/storage/volumes.md +++ b/content/en/docs/concepts/storage/volumes.md @@ -1315,7 +1315,6 @@ Learn how to #### CSI ephemeral volumes -{{< feature-state for_k8s_version="v1.15" state="alpha" >}} {{< feature-state for_k8s_version="v1.16" state="beta" >}} This feature allows CSI volumes to be directly embedded in the Pod specification instead of a PersistentVolume. Volumes specified in this way are ephemeral and do not persist across Pod restarts. @@ -1344,12 +1343,7 @@ spec: ``` This feature requires CSIInlineVolume feature gate to be enabled. It -is enabled by default in Kubernetes >= 1.16. In Kubernetes v1.15, it -has to be enabled explicitly: - -``` ---feature-gates=CSIInlineVolume=true -``` +is enabled by default starting with Kubernetes 1.16. CSI ephemeral volumes are only supported by a subset of CSI drivers. Please see the list of CSI drivers [here](https://kubernetes-csi.github.io/docs/drivers.html).