Skip to content

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

fix kubectl taint e2e flake: add retries for removing taint

parent b71def75
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
test/e2e/kubectl.go
View file @ b8b92a11
...@@ -1293,7 +1293,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1293,7 +1293,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
By("adding the taint " + testTaint.ToString() + " to a node") By("adding the taint " + testTaint.ToString() + " to a node")
runKubectlRetryOrDie("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 := runKubectlRetryOrDie("describe", "node", nodeName)
requiredStrings := [][]string{ requiredStrings := [][]string{
{"Name:", nodeName}, {"Name:", nodeName},
{"Taints:"}, {"Taints:"},
...@@ -1304,7 +1304,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1304,7 +1304,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
By("removing the taint " + testTaint.ToString() + " of a node") By("removing the taint " + testTaint.ToString() + " of a node")
runKubectlRetryOrDie("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 = runKubectlRetryOrDie("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)
} }
...@@ -1325,7 +1325,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1325,7 +1325,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
By("adding the taint " + testTaint.ToString() + " to a node") By("adding the taint " + testTaint.ToString() + " to a node")
runKubectlRetryOrDie("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 := runKubectlRetryOrDie("describe", "node", nodeName)
requiredStrings := [][]string{ requiredStrings := [][]string{
{"Name:", nodeName}, {"Name:", nodeName},
{"Taints:"}, {"Taints:"},
...@@ -1341,7 +1341,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1341,7 +1341,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
By("adding another taint " + newTestTaint.ToString() + " to the node") By("adding another taint " + newTestTaint.ToString() + " to the node")
runKubectlRetryOrDie("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 = runKubectlRetryOrDie("describe", "node", nodeName)
requiredStrings = [][]string{ requiredStrings = [][]string{
{"Name:", nodeName}, {"Name:", nodeName},
{"Taints:"}, {"Taints:"},
...@@ -1352,7 +1352,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { ...@@ -1352,7 +1352,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
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")
runKubectlRetryOrDie("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 = runKubectlRetryOrDie("describe", "node", nodeName)
if strings.Contains(output, testTaint.Key) { if strings.Contains(output, testTaint.Key) {
framework.Failf("Failed removing taints " + testTaint.Key + " of the node " + nodeName) framework.Failf("Failed removing taints " + testTaint.Key + " of the node " + nodeName)
} }
......
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