External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 17:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix bug where incorrect EE was being used for Container Group pods

Browse Source
This commit is contained in:
Shane McDonald
2021-04-30 12:18:49 -04:00
parent 0badc2fff7
commit 77c573d64a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -3038,13 +3038,14 @@ class AWXReceptorJob:
ee = get_default_execution_environment() ee = get_default_execution_environment()
default_pod_spec = get_default_pod_spec() default_pod_spec = get_default_pod_spec()
default_pod_spec['spec']['containers'][0]['image'] = ee.image
pod_spec_override = {} pod_spec_override = {}
if self.task and self.task.instance.instance_group.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_override = parse_yaml_or_json(self.task.instance.instance_group.pod_spec_override)
pod_spec = {**default_pod_spec, **pod_spec_override} pod_spec = {**default_pod_spec, **pod_spec_override}
pod_spec['spec']['containers'][0]['image'] = ee.image
if self.task: if self.task:
pod_spec['metadata'] = deepmerge( pod_spec['metadata'] = deepmerge(
pod_spec.get('metadata', {}), pod_spec.get('metadata', {}),