scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-08 00:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: run a test for requeueing with PreFilterResult correctly

Browse Source
This commit is contained in:
Kensei Nakada
2024-09-03 19:19:51 +09:00
parent f5c5384181
commit 24a14aa810
11 changed files with 189 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go
View File

@@ -137,11 +137,7 @@ var (
}},
},
NodeSelector: func() *v1.NodeSelector {
// Label selector...
nodeSelector := st.MakeNodeSelector().In("metadata.name", []string{nodeName}).Obj()
// ... but we need a field selector, so let's swap.
nodeSelector.NodeSelectorTerms[0].MatchExpressions, nodeSelector.NodeSelectorTerms[0].MatchFields = nodeSelector.NodeSelectorTerms[0].MatchFields, nodeSelector.NodeSelectorTerms[0].MatchExpressions
return nodeSelector
return st.MakeNodeSelector().In("metadata.name", []string{nodeName}, st.NodeSelectorTypeMatchFields).Obj()
}(),
}
deallocatingClaim = st.FromResourceClaim(pendingClaim).
@@ -160,10 +156,10 @@ var (
Obj()
allocatedClaimWithWrongTopology = st.FromResourceClaim(allocatedClaim).
Allocation(&resourceapi.AllocationResult{Controller: controller, NodeSelector: st.MakeNodeSelector().In("no-such-label", []string{"no-such-value"}).Obj()}).
Allocation(&resourceapi.AllocationResult{Controller: controller, NodeSelector: st.MakeNodeSelector().In("no-such-label", []string{"no-such-value"}, st.NodeSelectorTypeMatchExpressions).Obj()}).
Obj()
allocatedClaimWithGoodTopology = st.FromResourceClaim(allocatedClaim).
Allocation(&resourceapi.AllocationResult{Controller: controller, NodeSelector: st.MakeNodeSelector().In("kubernetes.io/hostname", []string{nodeName}).Obj()}).
Allocation(&resourceapi.AllocationResult{Controller: controller, NodeSelector: st.MakeNodeSelector().In("kubernetes.io/hostname", []string{nodeName}, st.NodeSelectorTypeMatchExpressions).Obj()}).
Obj()
otherClaim = st.MakeResourceClaim(controller).
Name("not-my-claim").