From 2794baf4c06092f2aecb7e3455a411691e47b553 Mon Sep 17 00:00:00 2001 From: carlory Date: Thu, 30 May 2024 23:22:37 +0800 Subject: [PATCH] fix dra flaky test on TestPlugin --- .../plugins/dynamicresources/dynamicresources.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go index 95a40b8d957..f01f89feb9c 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go @@ -1055,6 +1055,13 @@ func (pl *dynamicResources) lookupClassParameters(logger klog.Logger, class *res } return parameters, nil default: + sort.Slice(objs, func(i, j int) bool { + obj1, obj2 := objs[i].(*resourcev1alpha2.ResourceClassParameters), objs[j].(*resourcev1alpha2.ResourceClassParameters) + if obj1 == nil || obj2 == nil { + return false + } + return obj1.Name < obj2.Name + }) return nil, statusError(logger, fmt.Errorf("multiple generated class parameters for %s.%s %s found: %s", class.ParametersRef.Kind, class.ParametersRef.APIGroup, klog.KRef(class.Namespace, class.ParametersRef.Name), klog.KObjSlice(objs))) } } @@ -1112,6 +1119,13 @@ func (pl *dynamicResources) lookupClaimParameters(logger klog.Logger, class *res } return parameters, nil default: + sort.Slice(objs, func(i, j int) bool { + obj1, obj2 := objs[i].(*resourcev1alpha2.ResourceClaimParameters), objs[j].(*resourcev1alpha2.ResourceClaimParameters) + if obj1 == nil || obj2 == nil { + return false + } + return obj1.Name < obj2.Name + }) return nil, statusError(logger, fmt.Errorf("multiple generated claim parameters for %s.%s %s found: %s", claim.Spec.ParametersRef.Kind, claim.Spec.ParametersRef.APIGroup, klog.KRef(claim.Namespace, claim.Spec.ParametersRef.Name), klog.KObjSlice(objs))) } }