github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80780 from s-ito-ts/e2etest_podantiaffinity

Browse Source 
e2e test: Label all nodes in pod anti-affinity test.
This commit is contained in:
Kubernetes Prow Robot 2019-09-10 14:30:01 -07:00 committed by GitHub
commit 6d67e3d154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/scheduling/priorities.go
View File

@ -94,6 +94,9 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
}) })
ginkgo.It("Pod should be scheduled to node that don't match the PodAntiAffinity terms", func() { ginkgo.It("Pod should be scheduled to node that don't match the PodAntiAffinity terms", func() {
framework.SkipUnlessNodeCountIsAtLeast(2)
ginkgo.By("Trying to launch a pod with a label to get a node which can launch it.") ginkgo.By("Trying to launch a pod with a label to get a node which can launch it.")
pod := runPausePod(f, pausePodConfig{ pod := runPausePod(f, pausePodConfig{
Name: "pod-with-label-security-s1", Name: "pod-with-label-security-s1",
@ -101,14 +104,33 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
}) })
nodeName := pod.Spec.NodeName nodeName := pod.Spec.NodeName
ginkgo.By("Trying to apply a label on the found node.") k := v1.LabelHostname
k := fmt.Sprintf("kubernetes.io/e2e-%s", "node-topologyKey") ginkgo.By("Verifying the node has a label " + k)
v := "topologyvalue" node, err := cs.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
framework.AddOrUpdateLabelOnNode(cs, nodeName, k, v) framework.ExpectNoError(err)
framework.ExpectNodeHasLabel(cs, nodeName, k, v) if _, hasLabel := node.Labels[k]; !hasLabel {
defer framework.RemoveLabelOffNode(cs, nodeName, k) // If the label is not exists, label all nodes for testing.
ginkgo.By("Trying to apply a label on the found node.")
k = "kubernetes.io/e2e-node-topologyKey"
v := "topologyvalue1"
framework.AddOrUpdateLabelOnNode(cs, nodeName, k, v)
framework.ExpectNodeHasLabel(cs, nodeName, k, v)
defer framework.RemoveLabelOffNode(cs, nodeName, k)
ginkgo.By("Trying to apply a label on other nodes.")
v = "topologyvalue2"
for _, node := range nodeList.Items {
if node.Name != nodeName {
framework.AddOrUpdateLabelOnNode(cs, node.Name, k, v)
framework.ExpectNodeHasLabel(cs, node.Name, k, v)
defer framework.RemoveLabelOffNode(cs, node.Name, k)
}
}
}
// make the nodes have balanced cpu,mem usage // make the nodes have balanced cpu,mem usage
err := createBalancedPodForNodes(f, cs, ns, nodeList.Items, podRequestedResource, 0.6) err = createBalancedPodForNodes(f, cs, ns, nodeList.Items, podRequestedResource, 0.6)
framework.ExpectNoError(err) framework.ExpectNoError(err)
ginkgo.By("Trying to launch the pod with podAntiAffinity.") ginkgo.By("Trying to launch the pod with podAntiAffinity.")
labelPodName := "pod-with-pod-antiaffinity" labelPodName := "pod-with-pod-antiaffinity"