github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Add VolumeAttachment event registration to CSI volume limits plugin
This commit is contained in:
Kubernetes Prow Robot 2024-10-26 16:00:52 +01:00 committed by GitHub
commit 25d6f76538
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/scheduler/eventhandlers.go
View File

@ -555,6 +555,13 @@ func addAllEventHandlers(
return err return err
} }
handlers = append(handlers, handlerRegistration) 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: default:
// Tests may not instantiate dynInformerFactory. // Tests may not instantiate dynInformerFactory.
if dynInformerFactory == nil { if dynInformerFactory == nil {

1
pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
View File

@ -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.CSINode, ActionType: framework.Add}},
{Event: framework.ClusterEvent{Resource: framework.Pod, ActionType: framework.Delete}, QueueingHintFn: pl.isSchedulableAfterPodDeleted}, {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.PersistentVolumeClaim, ActionType: framework.Add}, QueueingHintFn: pl.isSchedulableAfterPVCAdded},
{Event: framework.ClusterEvent{Resource: framework.VolumeAttachment, ActionType: framework.Delete}},
}, nil }, nil
} }

2
pkg/scheduler/framework/types.go
View File

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

3
pkg/scheduler/scheduler_test.go
View File

@ -875,6 +875,7 @@ func Test_UnionedGVKs(t *testing.T) {
framework.PersistentVolume: framework.All - framework.Delete, framework.PersistentVolume: framework.All - framework.Delete,
framework.PersistentVolumeClaim: framework.All - framework.Delete, framework.PersistentVolumeClaim: framework.All - framework.Delete,
framework.StorageClass: 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.PersistentVolume: framework.All - framework.Delete,
framework.PersistentVolumeClaim: framework.All - framework.Delete, framework.PersistentVolumeClaim: framework.All - framework.Delete,
framework.StorageClass: framework.All - framework.Delete, framework.StorageClass: framework.All - framework.Delete,
framework.VolumeAttachment: framework.Delete,
}, },
enableInPlacePodVerticalScaling: true, enableInPlacePodVerticalScaling: true,
}, },
@ -904,6 +906,7 @@ func Test_UnionedGVKs(t *testing.T) {
framework.PersistentVolume: framework.All - framework.Delete, framework.PersistentVolume: framework.All - framework.Delete,
framework.PersistentVolumeClaim: framework.All - framework.Delete, framework.PersistentVolumeClaim: framework.All - framework.Delete,
framework.StorageClass: framework.All - framework.Delete, framework.StorageClass: framework.All - framework.Delete,
framework.VolumeAttachment: framework.Delete,
}, },
enableInPlacePodVerticalScaling: true, enableInPlacePodVerticalScaling: true,
enableSchedulerQueueingHints: true, enableSchedulerQueueingHints: true,