Merge pull request #16225 from simplytunde/merged-master-dev-1.16

Merged master into dev-1.16

content/en/docs/concepts/storage/persistent-volumes.md

@@ -268,7 +268,7 @@ Expanding EBS volumes is a time consuming operation. Also, there is a per-volume
 * AzureDisk
 * CSI
 * FC (Fibre Channel)
-* Flexvolume
+* FlexVolume
 * Flocker
 * NFS
 * iSCSI

content/en/docs/concepts/storage/storage-classes.md

@@ -53,6 +53,7 @@ provisioner: kubernetes.io/aws-ebs
 parameters:
   type: gp2
 reclaimPolicy: Retain
+allowVolumeExpansion: true
 mountOptions:
   - debug
 volumeBindingMode: Immediate
@@ -110,6 +111,31 @@ either `Delete` or `Retain`. If no `reclaimPolicy` is specified when a
 Persistent Volumes that are created manually and managed via a storage class will have
 whatever reclaim policy they were assigned at creation.
 
+### Allow Volume Expansion
+
+{{< feature-state for_k8s_version="v1.11" state="beta" >}}
+
+Persistent Volumes can be configured to be expandable. This feature when set to `true`, 
+allows the users to resize the volume by editing the corresponding PVC object. 
+
+The following types of volumes support volume expansion, when the underlying
+Storage Class has the field `allowVolumeExpansion` set to true.
+
+* gcePersistentDisk
+* awsElasticBlockStore
+* Cinder
+* glusterfs
+* rbd
+* Azure File
+* Azure Disk
+* Portworx
+* FlexVolumes
+* CSI  {{< feature-state for_k8s_version="v1.14" state="alpha" >}}
+
+{{< note >}}
+This feature cannot be used to shrink volumes.
+{{< /note >}}
+
 ### Mount Options
 
 Persistent Volumes that are dynamically created by a storage class will have the