Merge pull request kubernetes#128337 from torredil/fix-gce-cos-master-serial-5123

Add VolumeAttachment event registration to CSI volume limits plugin

Author: k8s-ci-robot

pkg/scheduler/eventhandlers.go

@@ -555,6 +555,13 @@ func addAllEventHandlers(
 				return err
 			}
 			handlers = append(handlers, handlerRegistration)
+		case framework.VolumeAttachment:
+			if handlerRegistration, err = informerFactory.Storage().V1().VolumeAttachments().Informer().AddEventHandler(
+				buildEvtResHandler(at, framework.VolumeAttachment),
+			); err != nil {
+				return err
+			}
+			handlers = append(handlers, handlerRegistration)
 		default:
 			// Tests may not instantiate dynInformerFactory.
 			if dynInformerFactory == nil {

pkg/scheduler/framework/plugins/nodevolumelimits/csi.go

@@ -89,6 +89,7 @@ func (pl *CSILimits) EventsToRegister(_ context.Context) ([]framework.ClusterEve
 		{Event: framework.ClusterEvent{Resource: framework.CSINode, ActionType: framework.Add}},
 		{Event: framework.ClusterEvent{Resource: framework.Pod, ActionType: framework.Delete}, QueueingHintFn: pl.isSchedulableAfterPodDeleted},
 		{Event: framework.ClusterEvent{Resource: framework.PersistentVolumeClaim, ActionType: framework.Add}, QueueingHintFn: pl.isSchedulableAfterPVCAdded},
+		{Event: framework.ClusterEvent{Resource: framework.VolumeAttachment, ActionType: framework.Delete}},
 	}, nil
 }
 

pkg/scheduler/framework/types.go

@@ -189,6 +189,7 @@ const (
 	PersistentVolumeClaim EventResource = "PersistentVolumeClaim"
 	CSINode               EventResource = "storage.k8s.io/CSINode"
 	CSIDriver             EventResource = "storage.k8s.io/CSIDriver"
+	VolumeAttachment      EventResource = "storage.k8s.io/VolumeAttachment"
 	CSIStorageCapacity    EventResource = "storage.k8s.io/CSIStorageCapacity"
 	StorageClass          EventResource = "storage.k8s.io/StorageClass"
 	ResourceClaim         EventResource = "resource.k8s.io/ResourceClaim"
@@ -218,6 +219,7 @@ var (
 		CSIDriver,
 		CSIStorageCapacity,
 		StorageClass,
+		VolumeAttachment,
 		ResourceClaim,
 		DeviceClass,
 	}

pkg/scheduler/scheduler_test.go

@@ -875,6 +875,7 @@ func Test_UnionedGVKs(t *testing.T) {
 				framework.PersistentVolume:      framework.All - framework.Delete,
 				framework.PersistentVolumeClaim: framework.All - framework.Delete,
 				framework.StorageClass:          framework.All - framework.Delete,
+				framework.VolumeAttachment:      framework.Delete,
 			},
 		},
 		{
@@ -889,6 +890,7 @@ func Test_UnionedGVKs(t *testing.T) {
 				framework.PersistentVolume:      framework.All - framework.Delete,
 				framework.PersistentVolumeClaim: framework.All - framework.Delete,
 				framework.StorageClass:          framework.All - framework.Delete,
+				framework.VolumeAttachment:      framework.Delete,
 			},
 			enableInPlacePodVerticalScaling: true,
 		},
@@ -904,6 +906,7 @@ func Test_UnionedGVKs(t *testing.T) {
 				framework.PersistentVolume:      framework.All - framework.Delete,
 				framework.PersistentVolumeClaim: framework.All - framework.Delete,
 				framework.StorageClass:          framework.All - framework.Delete,
+				framework.VolumeAttachment:      framework.Delete,
 			},
 			enableInPlacePodVerticalScaling: true,
 			enableSchedulerQueueingHints:    true,