Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix node.labels leak in scheduler predicates e2e #26886

Merged
merged 1 commit into from
Jun 18, 2016
Merged

fix node.labels leak in scheduler predicates e2e #26886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 28 additions & 17 deletions test/e2e/scheduler_predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,23 @@ func cleanupPods(c *client.Client, ns string) {
}
}

func removeLabelOffNode(c *client.Client, nodeName string, labelKey string) {
By("removing the label " + labelKey + " off the node " + nodeName)
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
if node.Labels == nil || len(node.Labels[labelKey]) == 0 {
return
}
delete(node.Labels, labelKey)
nodeUpdated, err := c.Nodes().Update(node)
framework.ExpectNoError(err)

By("verifying the node doesn't have the label " + labelKey)
if nodeUpdated.Labels != nil || len(nodeUpdated.Labels[labelKey]) != 0 {
framework.Failf("Failed removing label " + labelKey + " of the node " + nodeName)
}
}

// Waits until all existing pods are scheduled and returns their amount.
func waitForStableCluster(c *client.Client) int {
timeout := 10 * time.Minute
Expand Down Expand Up @@ -410,7 +427,6 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
})

It("validates that a pod with an invalid NodeAffinity is rejected", func() {

By("Trying to launch a pod with an invalid Affinity data.")
podName := "without-label"
_, err := c.Pods(ns).Create(&api.Pod{
Expand Down Expand Up @@ -494,6 +510,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to relaunch the pod, now with labels.")
labelPodName := "with-labels"
Expand Down Expand Up @@ -631,6 +648,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to relaunch the pod, now with labels.")
labelPodName := "with-labels"
Expand Down Expand Up @@ -680,6 +698,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
labelPod, err := c.Pods(ns).Get(labelPodName)
framework.ExpectNoError(err)
Expect(labelPod.Spec.NodeName).To(Equal(nodeName))

})

// Verify that an escaped JSON string of NodeAffinity in a YAML PodSpec works.
Expand Down Expand Up @@ -725,6 +744,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch a pod that with NodeAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-labels"
Expand Down Expand Up @@ -889,6 +909,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch the pod, now with podAffinity.")
labelPodName := "with-podaffinity-" + string(util.NewUUID())
Expand Down Expand Up @@ -980,6 +1001,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch the pod, now with podAffinity with same Labels.")
labelPodName := "with-podaffinity-" + string(util.NewUUID())
Expand Down Expand Up @@ -1069,6 +1091,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch the pod, now with multiple pod affinities with diff LabelOperators.")
labelPodName := "with-podaffinity-" + string(util.NewUUID())
Expand Down Expand Up @@ -1169,6 +1192,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch the pod, now with Pod affinity and anti affinity.")
labelPodName := "with-podantiaffinity-" + string(util.NewUUID())
Expand Down Expand Up @@ -1272,6 +1296,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
node, err := c.Nodes().Get(nodeName)
framework.ExpectNoError(err)
Expect(node.Labels[k]).To(Equal(v))
defer removeLabelOffNode(c, nodeName, k)

By("Trying to launch a pod that with PodAffinity & PodAntiAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-newlabels"
Expand Down Expand Up @@ -1353,6 +1378,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
{labelKey + "=" + labelValue},
}
checkOutput(labelOutput, labelOutputRequiredStrings)
defer removeLabelOffNode(c, nodeName, labelKey)

By("Trying to relaunch the pod, now with tolerations.")
tolerationPodName := "with-tolerations"
Expand Down Expand Up @@ -1403,14 +1429,6 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
if strings.Contains(output, taintName) {
framework.Failf("Failed removing taint " + taintName + " of the node " + nodeName)
}

By("removing the label " + labelKey + " off the node " + nodeName)
framework.RunKubectlOrDie("label", "nodes", nodeName, labelKey+"-")
By("verifying the node doesn't have the label " + labelKey)
output = framework.RunKubectlOrDie("describe", "node", nodeName)
if strings.Contains(output, labelKey) {
framework.Failf("Failed removing label " + labelKey + " of the node " + nodeName)
}
})

// 1. Run a pod to get an available node, then delete the pod
Expand Down Expand Up @@ -1475,6 +1493,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
{labelKey + "=" + labelValue},
}
checkOutput(labelOutput, labelOutputRequiredStrings)
defer removeLabelOffNode(c, nodeName, labelKey)

By("Trying to relaunch the pod, still no tolerations.")
podNameNoTolerations := "still-no-tolerations"
Expand Down Expand Up @@ -1527,13 +1546,5 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
deployedPod, err := c.Pods(ns).Get(podNameNoTolerations)
framework.ExpectNoError(err)
Expect(deployedPod.Spec.NodeName).To(Equal(nodeName))

By("removing the label " + labelKey + " off the node " + nodeName)
framework.RunKubectlOrDie("label", "nodes", nodeName, labelKey+"-")
By("verifying the node doesn't have the label " + labelKey)
output = framework.RunKubectlOrDie("describe", "node", nodeName)
if strings.Contains(output, labelKey) {
framework.Failf("Failed removing label " + labelKey + " of the node " + nodeName)
}
})
})