Skip to content

Commit cfe5a7d

Browse files
authored
Merge pull request kubernetes#125213 from carlory/fix-dra-flaky
fix dra flaky test on TestPlugin
2 parents ff5b5f9 + 2794baf commit cfe5a7d

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,13 @@ func (pl *dynamicResources) lookupClassParameters(logger klog.Logger, class *res
10551055
}
10561056
return parameters, nil
10571057
default:
1058+
sort.Slice(objs, func(i, j int) bool {
1059+
obj1, obj2 := objs[i].(*resourcev1alpha2.ResourceClassParameters), objs[j].(*resourcev1alpha2.ResourceClassParameters)
1060+
if obj1 == nil || obj2 == nil {
1061+
return false
1062+
}
1063+
return obj1.Name < obj2.Name
1064+
})
10581065
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)))
10591066
}
10601067
}
@@ -1112,6 +1119,13 @@ func (pl *dynamicResources) lookupClaimParameters(logger klog.Logger, class *res
11121119
}
11131120
return parameters, nil
11141121
default:
1122+
sort.Slice(objs, func(i, j int) bool {
1123+
obj1, obj2 := objs[i].(*resourcev1alpha2.ResourceClaimParameters), objs[j].(*resourcev1alpha2.ResourceClaimParameters)
1124+
if obj1 == nil || obj2 == nil {
1125+
return false
1126+
}
1127+
return obj1.Name < obj2.Name
1128+
})
11151129
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)))
11161130
}
11171131
}

0 commit comments

Comments
 (0)