From 56ee364b753b9097ea7b4cf06b710ae2b59d536b Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Thu, 7 Feb 2019 02:34:00 -0600 Subject: [PATCH] wait: Verify observed_generation exists Currently, Armada checks if the observed generation of a resource is zero for resource wait operations; however, the value can be None in some cases. This change verifies that the value is not zero and exists. Change-Id: Ib81be3468e73c72b4f20c11e18120d8a5b845e59 --- armada/handlers/wait.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armada/handlers/wait.py b/armada/handlers/wait.py index 0c804389..3b02180f 100644 --- a/armada/handlers/wait.py +++ b/armada/handlers/wait.py @@ -560,7 +560,7 @@ class StatefulSetWait(ControllerWait): msg.format(spec.update_strategy.type, ROLLING_UPDATE_STRATEGY_TYPE)) - if (status.observed_generation == 0 or + if (not status.observed_generation or sts.metadata.generation > status.observed_generation): msg = "Waiting for statefulset spec update to be observed..." return (msg, False)