DRA scheduler: adapt to v1alpha3 API

The structured parameter allocation logic was written from scratch in
staging/src/k8s.io/dynamic-resource-allocation/structured where it might be
useful for out-of-tree components.

Besides the new features (amount, admin access) and API it now supports
backtracking when the initial device selection doesn't lead to a complete
allocation of all claims.

Co-authored-by: Ed Bartosh <[email protected]>
Co-authored-by: John Belamaric <[email protected]>

Author: 3 people

pkg/scheduler/eventhandlers.go

@@ -488,28 +488,10 @@ func addAllEventHandlers(
 				)
 				handlers = append(handlers, handlerRegistration)
 			}
-		case framework.ResourceClass:
+		case framework.DeviceClass:
 			if utilfeature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation) {
-				if handlerRegistration, err = informerFactory.Resource().V1alpha3().ResourceClasses().Informer().AddEventHandler(
-					buildEvtResHandler(at, framework.ResourceClass, "ResourceClass"),
-				); err != nil {
-					return err
-				}
-				handlers = append(handlers, handlerRegistration)
-			}
-		case framework.ResourceClaimParameters:
-			if utilfeature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation) {
-				if handlerRegistration, err = informerFactory.Resource().V1alpha3().ResourceClaimParameters().Informer().AddEventHandler(
-					buildEvtResHandler(at, framework.ResourceClaimParameters, "ResourceClaimParameters"),
-				); err != nil {
-					return err
-				}
-				handlers = append(handlers, handlerRegistration)
-			}
-		case framework.ResourceClassParameters:
-			if utilfeature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation) {
-				if handlerRegistration, err = informerFactory.Resource().V1alpha3().ResourceClassParameters().Informer().AddEventHandler(
-					buildEvtResHandler(at, framework.ResourceClassParameters, "ResourceClassParameters"),
+				if handlerRegistration, err = informerFactory.Resource().V1alpha3().DeviceClasses().Informer().AddEventHandler(
+					buildEvtResHandler(at, framework.DeviceClass, "DeviceClass"),
 				); err != nil {
 					return err
 				}

pkg/scheduler/eventhandlers_test.go

@@ -232,11 +232,9 @@ func TestAddAllEventHandlers(t *testing.T) {
 		{
 			name: "DRA events disabled",
 			gvkMap: map[framework.GVK]framework.ActionType{
-				framework.PodSchedulingContext:    framework.Add,
-				framework.ResourceClaim:           framework.Add,
-				framework.ResourceClass:           framework.Add,
-				framework.ResourceClaimParameters: framework.Add,
-				framework.ResourceClassParameters: framework.Add,
+				framework.PodSchedulingContext: framework.Add,
+				framework.ResourceClaim:        framework.Add,
+				framework.DeviceClass:          framework.Add,
 			},
 			expectStaticInformers: map[reflect.Type]bool{
 				reflect.TypeOf(&v1.Pod{}):       true,
@@ -248,22 +246,18 @@ func TestAddAllEventHandlers(t *testing.T) {
 		{
 			name: "DRA events enabled",
 			gvkMap: map[framework.GVK]framework.ActionType{
-				framework.PodSchedulingContext:    framework.Add,
-				framework.ResourceClaim:           framework.Add,
-				framework.ResourceClass:           framework.Add,
-				framework.ResourceClaimParameters: framework.Add,
-				framework.ResourceClassParameters: framework.Add,
+				framework.PodSchedulingContext: framework.Add,
+				framework.ResourceClaim:        framework.Add,
+				framework.DeviceClass:          framework.Add,
 			},
 			enableDRA: true,
 			expectStaticInformers: map[reflect.Type]bool{
-				reflect.TypeOf(&v1.Pod{}):                                   true,
-				reflect.TypeOf(&v1.Node{}):                                  true,
-				reflect.TypeOf(&v1.Namespace{}):                             true,
-				reflect.TypeOf(&resourceapi.PodSchedulingContext{}):    true,
-				reflect.TypeOf(&resourceapi.ResourceClaim{}):           true,
-				reflect.TypeOf(&resourceapi.ResourceClaimParameters{}): true,
-				reflect.TypeOf(&resourceapi.ResourceClass{}):           true,
-				reflect.TypeOf(&resourceapi.ResourceClassParameters{}): true,
+				reflect.TypeOf(&v1.Pod{}):                           true,
+				reflect.TypeOf(&v1.Node{}):                          true,
+				reflect.TypeOf(&v1.Namespace{}):                     true,
+				reflect.TypeOf(&resourceapi.PodSchedulingContext{}): true,
+				reflect.TypeOf(&resourceapi.ResourceClaim{}):        true,
+				reflect.TypeOf(&resourceapi.DeviceClass{}):          true,
 			},
 			expectDynamicInformers: map[schema.GroupVersionResource]bool{},
 		},