From 77c573d64ab3efd1724453bdf4a8d6e630275bdf Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Fri, 30 Apr 2021 12:18:49 -0400 Subject: [PATCH] Fix bug where incorrect EE was being used for Container Group pods --- awx/main/tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 81e972d9cf..a7a780d2a5 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -3038,13 +3038,14 @@ class AWXReceptorJob: ee = get_default_execution_environment() default_pod_spec = get_default_pod_spec() - default_pod_spec['spec']['containers'][0]['image'] = ee.image pod_spec_override = {} if self.task and self.task.instance.instance_group.pod_spec_override: pod_spec_override = parse_yaml_or_json(self.task.instance.instance_group.pod_spec_override) pod_spec = {**default_pod_spec, **pod_spec_override} + pod_spec['spec']['containers'][0]['image'] = ee.image + if self.task: pod_spec['metadata'] = deepmerge( pod_spec.get('metadata', {}),