github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84513 from ingvagabund/retryAddOrUpdateAvoidPodOnNode

Browse Source 
test/e2e: AddOrUpdateAvoidPodOnNode/RemoveAvoidPodsOffNode: retry when conflict hit during annotation update
This commit is contained in:
Kubernetes Prow Robot 2019-11-01 19:59:52 -07:00 committed by GitHub
commit 567c1bb4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/util.go
View File

@ -1518,6 +1518,7 @@ func AddOrUpdateAvoidPodOnNode(c clientset.Interface, nodeName string, avoidPods
ExpectNoError(err) ExpectNoError(err)
} else { } else {
Logf("Conflict when trying to add/update avoidPods %v to %v with error %v", avoidPods, nodeName, err) Logf("Conflict when trying to add/update avoidPods %v to %v with error %v", avoidPods, nodeName, err)
return false, nil
} }
} }
return true, nil return true, nil
@ -1546,6 +1547,7 @@ func RemoveAvoidPodsOffNode(c clientset.Interface, nodeName string) {
ExpectNoError(err) ExpectNoError(err)
} else { } else {
Logf("Conflict when trying to remove avoidPods to %v", nodeName) Logf("Conflict when trying to remove avoidPods to %v", nodeName)
return false, nil
} }
} }
return true, nil return true, nil