Fix modifycontroller panic for non-csi volumes

Author: AndrewSirenko

pkg/modifycontroller/controller.go

@@ -268,11 +268,16 @@ 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
+	// 1. PV provisioned by CSI driver AND driver name matches local driver
+	// 2. Non-empty vac name
+	// 3. PVC is in Bound state
+	if pv.Spec.CSI == nil || pv.Spec.CSI.Driver != ctrl.name {
+		klog.V(7).InfoS("Skipping PV provisioned by different driver", "PV", klog.KObj(pv))
+		return nil
+	}
+
 	vacName := pvc.Spec.VolumeAttributesClassName
-	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound && pv.Spec.CSI.Driver == ctrl.name {
+	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound {
 		_, _, err, _ := ctrl.modify(pvc, pv)
 		if err != nil {
 			return err

pkg/modifycontroller/controller_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 	"testing"
 	"time"
@@ -156,6 +157,25 @@ func TestSyncPVC(t *testing.T) {
 	pvcWithUncreatedPV := createTestPVC(pvcName, targetVac /*vacName*/, testVac /*curVacName*/, testVac /*targetVacName*/)
 	pvcWithUncreatedPV.Spec.VolumeName = ""
 
+	nonCSIPVC := &v1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: pvcName, Namespace: pvcNamespace},
+		Spec: v1.PersistentVolumeClaimSpec{
+			VolumeAttributesClassName: &targetVac,
+			VolumeName:                pvName,
+		},
+		Status: v1.PersistentVolumeClaimStatus{
+			Phase: v1.ClaimBound,
+		},
+	}
+	nonCSIPV := &v1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: pvName,
+		},
+		Spec: v1.PersistentVolumeSpec{
+			VolumeAttributesClassName: nil,
+		},
+	}
+
 	tests := []struct {
 		name          string
 		pvc           *v1.PersistentVolumeClaim
@@ -192,6 +212,12 @@ func TestSyncPVC(t *testing.T) {
 			pv:            basePV,
 			callCSIModify: false,
 		},
+		{
+			name:          "Should NOT modify if PV wasn't provisioned by CSI driver",
+			pvc:           nonCSIPVC,
+			pv:            nonCSIPV,
+			callCSIModify: false,
+		},
 	}
 
 	for _, test := range tests {