Merge pull request #454 from huww98/deadcode

remove dead code

Author: k8s-ci-robot

pkg/modifycontroller/controller.go

@@ -181,25 +181,6 @@ func (ctrl *modifyController) deletePVC(obj interface{}) {
 	ctrl.claimQueue.Forget(objKey)
 }
 
-// modifyPVC modifies the PVC and PV based on VAC
-func (ctrl *modifyController) modifyPVC(pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume) error {
-	var err error
-	if isFirstTimeModifyVolumeWithPVC(pvc, pv) {
-		// If it is first time adding a vac, always validate and then call modify volume
-		_, _, err, _ = ctrl.validateVACAndModifyVolumeWithTarget(pvc, pv)
-	} else {
-		_, _, err, _ = ctrl.modify(pvc, pv)
-	}
-	return err
-}
-
-func isFirstTimeModifyVolumeWithPVC(pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume) bool {
-	if pv.Spec.VolumeAttributesClassName == nil && pvc.Spec.VolumeAttributesClassName != nil {
-		return true
-	}
-	return false
-}
-
 func (ctrl *modifyController) init(ctx context.Context) bool {
 	informersSyncd := []cache.InformerSynced{ctrl.pvListerSynced, ctrl.pvcListerSynced}
 	informersSyncd = append(informersSyncd, ctrl.vacListerSynced)

pkg/modifycontroller/controller_test.go

@@ -111,7 +111,10 @@ func TestController(t *testing.T) {
 				}
 			}
 			time.Sleep(time.Second * 2)
-			err = ctrlInstance.modifyPVC(test.pvc, test.pv)
+			_, _, err, _ = ctrlInstance.modify(test.pvc, test.pv)
+			if err != nil {
+				t.Fatalf("for %s: unexpected error: %v", test.name, err)
+			}
 
 			modifyCallCount := client.GetModifyCount()
 			if test.callCSIModify && modifyCallCount == 0 {

pkg/resizer/csi_resizer.go

@@ -281,11 +281,3 @@ func getCredentials(k8sClient kubernetes.Interface, ref *v1.SecretReference) (ma
 	}
 	return credentials, nil
 }
-
-func uniqueAccessModes(pvSpec v1.PersistentVolumeSpec) map[v1.PersistentVolumeAccessMode]bool {
-	m := map[v1.PersistentVolumeAccessMode]bool{}
-	for _, mode := range pvSpec.AccessModes {
-		m[mode] = true
-	}
-	return m
-}