airship
/
armada
Code Issues Proposed changes

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
This commit is contained in:
Phil Sphicas 2020-04-19 18:23:46 +00:00
parent c72dae0c5c
commit ae1281d874
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
armada/handlers/wait.py
View File

@ -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):