Merge branch 'kubernetes-csi:master' into resizerExtraMetadataFeature

Author: mdzraf

pkg/modifycontroller/controller.go

@@ -280,8 +280,9 @@ func (ctrl *modifyController) syncPVC(key string) error {
 	// Only trigger modify volume if the following conditions are met
 	// 1. Non empty vac name
 	// 2. PVC is in Bound state
+	// 3. PV CSI driver name matches local driver
 	vacName := pvc.Spec.VolumeAttributesClassName
-	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound {
+	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound && pv.Spec.CSI.Driver == ctrl.name {
 		_, _, err, _ := ctrl.modify(pvc, pv)
 		if err != nil {
 			return err

pkg/modifycontroller/modify_status.go

@@ -94,24 +94,23 @@ func (ctrl *modifyController) updateConditionBasedOnError(pvc *v1.PersistentVolu
 // markControllerModifyVolumeStatus will mark ModifyVolumeStatus as completed in the PVC
 // and update CurrentVolumeAttributesClassName, clear the conditions
 func (ctrl *modifyController) markControllerModifyVolumeCompleted(pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume) (*v1.PersistentVolumeClaim, *v1.PersistentVolume, error) {
+	modifiedVacName := pvc.Status.ModifyVolumeStatus.TargetVolumeAttributesClassName
+
 	// Update PVC
 	newPVC := pvc.DeepCopy()
+
 	// Update ModifyVolumeStatus to completed
-	var controllerModifyVolumeCompleted v1.PersistentVolumeClaimModifyVolumeStatus
-	if newPVC.Status.ModifyVolumeStatus == nil {
-		newPVC.Status.ModifyVolumeStatus = &v1.ModifyVolumeStatus{}
-	}
-	newPVC.Status.ModifyVolumeStatus.Status = controllerModifyVolumeCompleted
+	newPVC.Status.ModifyVolumeStatus = nil
 
 	// Update CurrentVolumeAttributesClassName
-	newPVC.Status.CurrentVolumeAttributesClassName = &newPVC.Status.ModifyVolumeStatus.TargetVolumeAttributesClassName
+	newPVC.Status.CurrentVolumeAttributesClassName = &modifiedVacName
 
-	// Clear all the conditions
+	// Clear all the conditions related to modify volume
 	newPVC.Status.Conditions = clearModifyVolumeConditions(newPVC.Status.Conditions)
 
 	// Update PV
 	newPV := pv.DeepCopy()
-	newPV.Spec.VolumeAttributesClassName = &newPVC.Status.ModifyVolumeStatus.TargetVolumeAttributesClassName
+	newPV.Spec.VolumeAttributesClassName = &modifiedVacName
 
 	// Update PV before PVC to avoid PV not getting updated but PVC did
 	updatedPV, err := util.PatchPersistentVolume(ctrl.kubeClient, pv, newPV)

pkg/modifycontroller/modify_status_test.go

@@ -201,6 +201,7 @@ func TestMarkControllerModifyVolumeCompleted(t *testing.T) {
 	expectedPV := basePV.DeepCopy()
 	expectedPV.Spec.VolumeAttributesClassName = &targetVac
 	expectedPVC := basePVC.WithCurrentVolumeAttributesClassName(targetVac).Get()
+	expectedPVC.Status.ModifyVolumeStatus = nil
 
 	tests := []struct {
 		name        string
@@ -214,7 +215,7 @@ func TestMarkControllerModifyVolumeCompleted(t *testing.T) {
 			name:        "update modify volume status to completed",
 			pvc:         basePVC.Get(),
 			pv:          basePV,
-			expectedPVC: basePVC.WithCurrentVolumeAttributesClassName(targetVac).Get(),
+			expectedPVC: expectedPVC,
 			expectedPV:  expectedPV,
 		},
 		{

pkg/modifycontroller/modify_volume_test.go

@@ -79,15 +79,12 @@ func TestModify(t *testing.T) {
 			expectedPVVolumeAttributesClassName:      &testVac,
 		},
 		{
-			name:             "modify volume success",
-			pvc:              createTestPVC(pvcName, targetVac /*vacName*/, testVac /*curVacName*/, testVac /*targetVacName*/),
-			pv:               basePV,
-			vacExists:        true,
-			expectModifyCall: true,
-			expectedModifyVolumeStatus: &v1.ModifyVolumeStatus{
-				TargetVolumeAttributesClassName: targetVac,
-				Status:                          "",
-			},
+			name:                                     "modify volume success",
+			pvc:                                      createTestPVC(pvcName, targetVac /*vacName*/, testVac /*curVacName*/, testVac /*targetVacName*/),
+			pv:                                       basePV,
+			vacExists:                                true,
+			expectModifyCall:                         true,
+			expectedModifyVolumeStatus:               nil,
 			expectedCurrentVolumeAttributesClassName: &targetVac,
 			expectedPVVolumeAttributesClassName:      &targetVac,
 		},