Namespace controller error handling improvements

This commit is contained in:
derekwaynecarr
2016-02-26 13:06:27 -05:00
parent 649b6879d7
commit a301a2565e
2 changed files with 11 additions and 0 deletions

View File

@@ -244,6 +244,12 @@ func syncNamespace(kubeClient clientset.Interface, versions *unversioned.APIVers
// we have removed content, so mark it finalized by us
result, err := retryOnConflictError(kubeClient, namespace, finalizeNamespaceFunc)
if err != nil {
// in normal practice, this should not be possible, but if a deployment is running
// two controllers to do namespace deletion that share a common finalizer token it's
// possible that a not found could occur since the other controller would have finished the delete.
if errors.IsNotFound(err) {
return nil
}
return err
}