Merge "Avoid race when pod is deleted before finalizer is added"

This commit is contained in:
Zuul 2020-09-28 11:48:36 +00:00 committed by Gerrit Code Review
commit 084fe6c415
1 changed files with 5 additions and 1 deletions

View File

@ -271,7 +271,11 @@ class K8sClient(object):
# Object is being deleting or gone. Return.
return False
except exc.K8sConflict:
obj = self.get(path)
try:
obj = self.get(path)
except exc.K8sResourceNotFound:
# Object got removed before finalizer was set
return False
if finalizer in obj['metadata'].get('finalizers', []):
# Finalizer is there, return.
return True