github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Add a function to ensure created nodes are present in scheduler cache

Browse Source
This commit is contained in:
Wei Huang
2020-10-30 13:14:01 -07:00
parent 7e1f4a9fa3
commit f054765762
8 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/integration/scheduler/priorities_test.go
View File

@@ -72,9 +72,9 @@ func TestNodeAffinity(t *testing.T) {
testCtx := initTestSchedulerForPriorityTest(t, nodeaffinity.Name)
defer testutils.CleanupTest(t, testCtx)
// Add a few nodes.
_, err := createNodes(testCtx.ClientSet, "testnode", st.MakeNode(), 4)
_, err := createAndWaitForNodesInCache(testCtx, "testnode", st.MakeNode(), 4)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
// Add a label to one of the nodes.
labelKey := "kubernetes.io/node-topologyKey"
@@ -126,9 +126,9 @@ func TestPodAffinity(t *testing.T) {
// Add a few nodes.
topologyKey := "node-topologykey"
topologyValue := "topologyvalue"
nodesInTopology, err := createNodes(testCtx.ClientSet, "in-topology", st.MakeNode().Label(topologyKey, topologyValue), 5)
nodesInTopology, err := createAndWaitForNodesInCache(testCtx, "in-topology", st.MakeNode().Label(topologyKey, topologyValue), 5)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
// Add a pod with a label and wait for it to schedule.
labelKey := "service"
@@ -142,9 +142,9 @@ func TestPodAffinity(t *testing.T) {
t.Fatalf("Error running the attractor pod: %v", err)
}
// Add a few more nodes without the topology label.
_, err = createNodes(testCtx.ClientSet, "other-node", st.MakeNode(), 5)
_, err = createAndWaitForNodesInCache(testCtx, "other-node", st.MakeNode(), 5)
if err != nil {
t.Fatalf("Cannot create the second set of nodes: %v", err)
t.Fatal(err)
}
// Add a new pod with affinity to the attractor pod.
podName := "pod-with-podaffinity"
@@ -215,9 +215,9 @@ func TestImageLocality(t *testing.T) {
}
// Add a few nodes.
_, err = createNodes(testCtx.ClientSet, "testnode", st.MakeNode(), 10)
_, err = createAndWaitForNodesInCache(testCtx, "testnode", st.MakeNode(), 10)
if err != nil {
t.Fatalf("cannot create nodes: %v", err)
t.Fatal(err)
}
// Create a pod with containers each having the specified image.