storage: CSI inline volumes in beta

kubernetes · Aug 6, 2019 · 23be7aa · 23be7aa
1 parent cc64c39
commit 23be7aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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 | |