Merge pull request kubernetes-csi#195 from Madhu-1/process-csi-vol

Avoid logging PV name,where PV created by other CSI

pkg/controller/controller.go

@@ -154,12 +154,18 @@ func (ctrl *CSIAttachController) vaDeleted(obj interface{}) {
 // pvAdded reacts to a PV creation
 func (ctrl *CSIAttachController) pvAdded(obj interface{}) {
 	pv := obj.(*v1.PersistentVolume)
+	if !ctrl.processFinalizers(pv) {
+		return
+	}
 	ctrl.pvQueue.Add(pv.Name)
 }
 
 // pvUpdated reacts to a PV update
 func (ctrl *CSIAttachController) pvUpdated(old, new interface{}) {
 	pv := new.(*v1.PersistentVolume)
+	if !ctrl.processFinalizers(pv) {
+		return
+	}
 	ctrl.pvQueue.Add(pv.Name)
 }
 
@@ -193,6 +199,13 @@ func (ctrl *CSIAttachController) syncVA() {
 	ctrl.handler.SyncNewOrUpdatedVolumeAttachment(va)
 }
 
+func (ctrl *CSIAttachController) processFinalizers(pv *v1.PersistentVolume) bool {
+	if pv.Spec.CSI != nil && pv.Spec.CSI.Driver == ctrl.attacherName {
+		return true
+	}
+	return false
+}
+
 // syncPV deals with one key off the queue.  It returns false when it's time to quit.
 func (ctrl *CSIAttachController) syncPV() {
 	key, quit := ctrl.pvQueue.Get()

pkg/controller/csi_handler_test.go

@@ -131,6 +131,12 @@ func gcePDPVWithFinalizer() *v1.PersistentVolume {
 	return pv
 }
 
+func pvWithDriverName(driver string) *v1.PersistentVolume {
+	pv := pv()
+	pv.Spec.CSI.Driver = driver
+	return pv
+}
+
 func pvWithFinalizer() *v1.PersistentVolume {
 	pv := pv()
 	pv.Finalizers = []string{fin}
@@ -1259,6 +1265,12 @@ func TestCSIHandler(t *testing.T) {
 			deletedVA:       va(false, "", nil),
 			expectedActions: []core.Action{},
 		},
+		{
+			name:            "PV created by other CSI drivers or in-tree provisioners -> ignored",
+			initialObjects:  []runtime.Object{},
+			updatedPV:       pvWithDriverName("dummy"),
+			expectedActions: []core.Action{},
+		},
 	}
 
 	runTests(t, csiHandlerFactory, tests)