From f5aaf40e889404ba3d88c5c518b58714cd51432c Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 2 Mar 2021 13:47:27 +0100
Subject: [PATCH] storage capacity: beta

After the promotion to beta in 1.21, enabling the feature is easier
and mostly just depends on the CSI driver deployment.
---
 .../docs/concepts/storage/storage-capacity.md | 33 +++----------------
 .../feature-gates.md                          |  3 +-
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/content/en/docs/concepts/storage/storage-capacity.md b/content/en/docs/concepts/storage/storage-capacity.md
index d5993d4f59a13..13ae8ab722a31 100644
--- a/content/en/docs/concepts/storage/storage-capacity.md
+++ b/content/en/docs/concepts/storage/storage-capacity.md
@@ -17,6 +17,7 @@ which a pod runs: network-attached storage might not be accessible by
 all nodes, or storage is local to a node to begin with.
 
 {{< feature-state for_k8s_version="v1.19" state="alpha" >}}
+{{< feature-state for_k8s_version="v1.21" state="beta" >}}
 
 This page describes how Kubernetes keeps track of storage capacity and
 how the scheduler uses that information to schedule Pods onto nodes
@@ -103,34 +104,10 @@ to handle this automatically.
 
 ## Enabling storage capacity tracking
 
-Storage capacity tracking is an *alpha feature* and only enabled when
-the `CSIStorageCapacity` [feature
-gate](/docs/reference/command-line-tools-reference/feature-gates/) and
-the `storage.k8s.io/v1alpha1` {{< glossary_tooltip text="API group" term_id="api-group" >}} are enabled. For details on
-that, see the `--feature-gates` and `--runtime-config` [kube-apiserver
-parameters](/docs/reference/command-line-tools-reference/kube-apiserver/).
-
-A quick check
-whether a Kubernetes cluster supports the feature is to list
-CSIStorageCapacity objects with:
-```shell
-kubectl get csistoragecapacities --all-namespaces
-```
-
-If your cluster supports CSIStorageCapacity, the response is either a list of CSIStorageCapacity objects or:
-```
-No resources found
-```
-
-If not supported, this error is printed instead:
-```
-error: the server doesn't have a resource type "csistoragecapacities"
-```
-
-In addition to enabling the feature in the cluster, a CSI
-driver also has to
-support it. Please refer to the driver's documentation for
-details.
+Storage capacity tracking is a beta feature and enabled by default in
+a Kubernetes cluster since Kubernetes 1.21. In addition to having the
+feature enabled in the cluster, a CSI driver also has to support
+it. Please refer to the driver's documentation for details.
 
 ## {{% heading "whatsnext" %}}
 
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 2e9db5fce08ef..91062f3895c7d 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
@@ -85,7 +85,8 @@ different Kubernetes components.
 | `CSIMigrationvSphere` | `false` | Beta | 1.19 | |
 | `CSIMigrationvSphereComplete` | `false` | Beta | 1.19 | |
 | `CSIServiceAccountToken` | `false` | Alpha | 1.20 | |
-| `CSIStorageCapacity` | `false` | Alpha | 1.19 | |
+| `CSIStorageCapacity` | `false` | Alpha | 1.19 | 1.20 |
+| `CSIStorageCapacity` | `true` | Beta | 1.21 | |
 | `CSIVolumeFSGroupPolicy` | `false` | Alpha | 1.19 | 1.19 |
 | `CSIVolumeFSGroupPolicy` | `true` | Beta | 1.20 | |
 | `ConfigurableFSGroupPolicy` | `false` | Alpha | 1.18 | 1.19 |