Using provisioner name as resizer name

Author: Cheng Pan

pkg/resizer/csi_resizer.go

@@ -42,10 +42,9 @@ const (
 	resizerSecretNameKey      = "csi.storage.k8s.io/resizer-secret-name"
 	resizerSecretNamespaceKey = "csi.storage.k8s.io/resizer-secret-namespace"
 
-	// In-tree resizer populates the key with the value as the storage plugin name
 	// If CSI migration is enabled, the value will be CSI driver name
 	// Otherwise, it will be in-tree storage plugin name
-	volumeResizerKey = "volume.kubernetes.io/storage-resizer"
+	volumeResizerKey = "volume.beta.kubernetes.io/storage-provisioner"
 )
 
 var (
@@ -149,23 +148,26 @@ func (r *csiResizer) CanSupport(pv *v1.PersistentVolume, pvc *v1.PersistentVolum
 // It supports both CSI volume and migrated in-tree volume
 func (r *csiResizer) Resize(pv *v1.PersistentVolume, requestSize resource.Quantity) (resource.Quantity, bool, error) {
 	oldSize := pv.Spec.Capacity[v1.ResourceStorage]
-	var err error
 
-	if csitranslationlib.IsMigratedCSIDriverByName(r.name) {
-		// handle migrated in-tree volume
-		pv, err = csitranslationlib.TranslateInTreePVToCSI(pv)
-		if err != nil {
-			return oldSize, false, fmt.Errorf("failed to translate persistent volume: %v", err)
+	var volumeID string
+	if pv.Spec.CSI != nil {
+		// handle CSI volume
+		source := pv.Spec.CSI
+		volumeID = source.VolumeHandle
+	} else {
+		if csitranslationlib.IsMigratedCSIDriverByName(r.name) {
+			// handle migrated in-tree volume
+			csiPV, err := csitranslationlib.TranslateInTreePVToCSI(pv)
+			if err != nil {
+				return oldSize, false, fmt.Errorf("failed to translate persistent volume: %v", err)
+			}
+			volumeID = csiPV.Spec.CSI.VolumeHandle
+		} else {
+			// non-migrated in-tree volume
+			return oldSize, false, fmt.Errorf("volume %v is not migrated to CSI", pv.Name)
 		}
 	}
 
-	source := pv.Spec.CSI
-	if source == nil {
-		// in-tree volume that is not migrated yet
-		return oldSize, false, fmt.Errorf("volume %v is not migrated to CSI", pv.Name)
-	}
-	volumeID := source.VolumeHandle
-
 	if len(volumeID) == 0 {
 		return oldSize, false, errors.New("empty volume handle")
 	}
@@ -194,7 +196,12 @@ func (r *csiResizer) Resize(pv *v1.PersistentVolume, requestSize resource.Quanti
 	if err != nil {
 		return oldSize, nodeResizeRequired, err
 	}
-	return *resource.NewQuantity(newSizeBytes, resource.BinarySI), nodeResizeRequired, err
+
+	if pv.Spec.VolumeMode == nil || *pv.Spec.VolumeMode == v1.PersistentVolumeFilesystem {
+		return *resource.NewQuantity(newSizeBytes, resource.BinarySI), nodeResizeRequired, err
+	}
+
+	return *resource.NewQuantity(newSizeBytes, resource.BinarySI), false, err
 }
 
 func getDriverName(client csi.Client, timeout time.Duration) (string, error) {

pkg/resizer/csi_resizer_test.go

@@ -203,7 +203,7 @@ func createPVC(resizerName string) *v1.PersistentVolumeClaim {
 			Name:      "testPVC",
 			Namespace: "test",
 			Annotations: map[string]string{
-				"volume.kubernetes.io/storage-resizer": resizerName,
+				volumeResizerKey: resizerName,
 			},
 		},
 		Spec: v1.PersistentVolumeClaimSpec{