From b3ba6bda2b4e6a5f46716a0449418b64b623e1ce Mon Sep 17 00:00:00 2001 From: kerthcet Date: Mon, 19 Feb 2024 11:55:50 +0800 Subject: [PATCH] Add missed clusterEvents to UnrollWildCardResource Signed-off-by: kerthcet --- pkg/scheduler/framework/types.go | 14 ++++++++------ pkg/scheduler/scheduler_test.go | 8 ++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkg/scheduler/framework/types.go b/pkg/scheduler/framework/types.go index fc79e4afe13..cc839b3e3ee 100644 --- a/pkg/scheduler/framework/types.go +++ b/pkg/scheduler/framework/types.go @@ -76,13 +76,13 @@ const ( Node GVK = "Node" PersistentVolume GVK = "PersistentVolume" PersistentVolumeClaim GVK = "PersistentVolumeClaim" - PodSchedulingContext GVK = "PodSchedulingContext" - ResourceClaim GVK = "ResourceClaim" - ResourceClass GVK = "ResourceClass" - StorageClass GVK = "storage.k8s.io/StorageClass" CSINode GVK = "storage.k8s.io/CSINode" CSIDriver GVK = "storage.k8s.io/CSIDriver" CSIStorageCapacity GVK = "storage.k8s.io/CSIStorageCapacity" + StorageClass GVK = "storage.k8s.io/StorageClass" + PodSchedulingContext GVK = "PodSchedulingContext" + ResourceClaim GVK = "ResourceClaim" + ResourceClass GVK = "ResourceClass" // WildCard is a special GVK to match all resources. // e.g., If you register `{Resource: "*", ActionType: All}` in EventsToRegister, @@ -167,13 +167,15 @@ func UnrollWildCardResource() []ClusterEventWithHint { return []ClusterEventWithHint{ {Event: ClusterEvent{Resource: Pod, ActionType: All}}, {Event: ClusterEvent{Resource: Node, ActionType: All}}, + {Event: ClusterEvent{Resource: PersistentVolume, ActionType: All}}, + {Event: ClusterEvent{Resource: PersistentVolumeClaim, ActionType: All}}, {Event: ClusterEvent{Resource: CSINode, ActionType: All}}, {Event: ClusterEvent{Resource: CSIDriver, ActionType: All}}, {Event: ClusterEvent{Resource: CSIStorageCapacity, ActionType: All}}, - {Event: ClusterEvent{Resource: PersistentVolume, ActionType: All}}, - {Event: ClusterEvent{Resource: PersistentVolumeClaim, ActionType: All}}, {Event: ClusterEvent{Resource: StorageClass, ActionType: All}}, {Event: ClusterEvent{Resource: PodSchedulingContext, ActionType: All}}, + {Event: ClusterEvent{Resource: ResourceClaim, ActionType: All}}, + {Event: ClusterEvent{Resource: ResourceClass, ActionType: All}}, } } diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index b356aa2075b..01aa43fc632 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -637,6 +637,12 @@ func Test_buildQueueingHintMap(t *testing.T) { {Resource: framework.PodSchedulingContext, ActionType: framework.All}: { {PluginName: filterWithoutEnqueueExtensions, QueueingHintFn: defaultQueueingHintFn}, }, + {Resource: framework.ResourceClaim, ActionType: framework.All}: { + {PluginName: filterWithoutEnqueueExtensions, QueueingHintFn: defaultQueueingHintFn}, + }, + {Resource: framework.ResourceClass, ActionType: framework.All}: { + {PluginName: filterWithoutEnqueueExtensions, QueueingHintFn: defaultQueueingHintFn}, + }, }, }, { @@ -770,6 +776,8 @@ func Test_UnionedGVKs(t *testing.T) { framework.PersistentVolumeClaim: framework.All, framework.StorageClass: framework.All, framework.PodSchedulingContext: framework.All, + framework.ResourceClaim: framework.All, + framework.ResourceClass: framework.All, }, }, {