Skip to content

K
k3s
Commit c47bb43c authored by Kevin's avatar Kevin
Browse files
Options

fix node update taints conflict in kubectl taint e2e

parent aa60583e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
test/e2e/kubectl.go
View file @ c47bb43c
...@@ -1292,7 +1292,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1292,7 +1292,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
nodeName := node.Name nodeName := node.Name
By("adding the taint " + testTaint.ToString() + " to a node") By("adding the taint " + testTaint.ToString() + " to a node")
framework.RunKubectlOrDie("taint", "nodes", nodeName, testTaint.ToString()) runKubectlRetryOrDie("taint", "nodes", nodeName, testTaint.ToString())
By("verifying the node has the taint " + testTaint.ToString()) By("verifying the node has the taint " + testTaint.ToString())
output := framework.RunKubectlOrDie("describe", "node", nodeName) output := framework.RunKubectlOrDie("describe", "node", nodeName)
requiredStrings := [][]string{ requiredStrings := [][]string{
...@@ -1303,13 +1303,12 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1303,13 +1303,12 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
checkOutput(output, requiredStrings) checkOutput(output, requiredStrings)
By("removing the taint " + testTaint.ToString() + " of a node") By("removing the taint " + testTaint.ToString() + " of a node")
framework.RunKubectlOrDie("taint", "nodes", nodeName, testTaint.Key+":"+string(testTaint.Effect)+"-") runKubectlRetryOrDie("taint", "nodes", nodeName, testTaint.Key+":"+string(testTaint.Effect)+"-")
By("verifying the node doesn't have the taint " + testTaint.Key) By("verifying the node doesn't have the taint " + testTaint.Key)
output = framework.RunKubectlOrDie("describe", "node", nodeName) output = framework.RunKubectlOrDie("describe", "node", nodeName)
if strings.Contains(output, testTaint.Key) { if strings.Contains(output, testTaint.Key) {
framework.Failf("Failed removing taint " + testTaint.Key + " of the node " + nodeName) framework.Failf("Failed removing taint " + testTaint.Key + " of the node " + nodeName)
} }
}) })
It("should remove all the taints with the same key off a node", func() { It("should remove all the taints with the same key off a node", func() {
...@@ -1325,7 +1324,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1325,7 +1324,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
nodeName := node.Name nodeName := node.Name
By("adding the taint " + testTaint.ToString() + " to a node") By("adding the taint " + testTaint.ToString() + " to a node")
framework.RunKubectlOrDie("taint", "nodes", nodeName, testTaint.ToString()) runKubectlRetryOrDie("taint", "nodes", nodeName, testTaint.ToString())
By("verifying the node has the taint " + testTaint.ToString()) By("verifying the node has the taint " + testTaint.ToString())
output := framework.RunKubectlOrDie("describe", "node", nodeName) output := framework.RunKubectlOrDie("describe", "node", nodeName)
requiredStrings := [][]string{ requiredStrings := [][]string{
...@@ -1341,7 +1340,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1341,7 +1340,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
Effect: api.TaintEffectPreferNoSchedule, Effect: api.TaintEffectPreferNoSchedule,
} }
By("adding another taint " + newTestTaint.ToString() + " to the node") By("adding another taint " + newTestTaint.ToString() + " to the node")
framework.RunKubectlOrDie("taint", "nodes", nodeName, newTestTaint.ToString()) runKubectlRetryOrDie("taint", "nodes", nodeName, newTestTaint.ToString())
By("verifying the node has the taint " + newTestTaint.ToString()) By("verifying the node has the taint " + newTestTaint.ToString())
output = framework.RunKubectlOrDie("describe", "node", nodeName) output = framework.RunKubectlOrDie("describe", "node", nodeName)
requiredStrings = [][]string{ requiredStrings = [][]string{
...@@ -1352,7 +1351,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1352,7 +1351,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
checkOutput(output, requiredStrings) checkOutput(output, requiredStrings)
By("removing all taints that have the same key " + testTaint.Key + " of the node") By("removing all taints that have the same key " + testTaint.Key + " of the node")
framework.RunKubectlOrDie("taint", "nodes", nodeName, testTaint.Key+"-") runKubectlRetryOrDie("taint", "nodes", nodeName, testTaint.Key+"-")
By("verifying the node doesn't have the taints that have the same key " + testTaint.Key) By("verifying the node doesn't have the taints that have the same key " + testTaint.Key)
output = framework.RunKubectlOrDie("describe", "node", nodeName) output = framework.RunKubectlOrDie("describe", "node", nodeName)
if strings.Contains(output, testTaint.Key) { if strings.Contains(output, testTaint.Key) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment