From ae1281d8747baab00fc664058adfb236af44d2f9 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Sun, 19 Apr 2020 18:23:46 +0000 Subject: [PATCH] Fix: wait.resources: [] should disable waits The mechanism to disable waits is to explictly set wait.resources: [] After a recent update [https://review.opendev.org/#/c/697728/], this configuration results in the default waits (pods and jobs). This change restores the original functionality. Change-Id: If5d09f649ca037855c88f928aee6b4dc35ca8b48 --- armada/handlers/wait.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/armada/handlers/wait.py b/armada/handlers/wait.py index 2473047f..57790259 100644 --- a/armada/handlers/wait.py +++ b/armada/handlers/wait.py @@ -59,7 +59,10 @@ class ChartWait(): schema_info = get_schema_info(self.chart['schema']) resources = self.wait_config.get('resources') - if not resources: + + # wait.resources can be set to [] to disable all resource types, so + # don't override with defaults + if resources is None: resources = self.wait_config.get('resources_list') if isinstance(resources, list):