UPSTREAM: 84513: test/e2e: AddOrUpdateAvoidPodOnNode/RemoveAvoidPodsOffNode: retry when conflict hit during annotation update
@@ -1965,6 +1965,7 @@ func AddOrUpdateAvoidPodOnNode(c clientset.Interface, nodeName string, avoidPods
ExpectNoError(err)
} else {
e2elog.Logf("Conflict when trying to add/update avoidPods %v to %v with error %v", avoidPods, nodeName, err)
+ return false, nil
}
}
return true, nil
@@ -1993,6 +1994,7 @@ func RemoveAvoidPodsOffNode(c clientset.Interface, nodeName string) {
ExpectNoError(err)
} else {
e2elog.Logf("Conflict when trying to remove avoidPods to %v", nodeName)
+ return false, nil
}
}
return true, nil
