Make test harness and comments match Kubernetes behaviour on conflict error

Kubernetes always returns nil on error; somehow I had the wrong idea
here.
This commit is contained in:
Bryan Boreham committed 2019-03-26 17:19:22 +00:00
1 parent b248e021ec
commit bd24dd7dae
2 files changed
+3 -7

No files matched your search

-4
View File
@@ -110,10 +110,6 @@ func ObjectReaction(tracker ObjectTracker) testing.ReactionFunc {
}
err = tracker.Update(gvr, action.GetObject(), ns)
if err != nil {
if errors.IsConflict(err) { // return the currently-stored version of the object
obj, _ := tracker.Get(gvr, ns, objMeta.GetName())
return true, obj, err
}
return true, nil, err
}
obj, err := tracker.Get(gvr, ns, objMeta.GetName())