mirror of
https://github.com/ansible/awx-operator.git
synced 2026-05-08 06:12:54 +00:00
Bind EE images version with DEFAULT_AWX_VERSION (#1740)
* bind ee_images, control_plane_ee_image and init_container_image with DEFAULT_AWX_VERSION instead of "latest" * fix when condition on init_container_image_version check * Use DEFAULT_AWX_VERSION for AWXMeshIngress * Add back AWX EE latest for backward compatibility --------- Co-authored-by: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
This commit is contained in:
@@ -278,10 +278,12 @@ init_container_extra_commands: ''
|
||||
init_container_extra_volume_mounts: ''
|
||||
|
||||
ee_images:
|
||||
- name: AWX EE (latest)
|
||||
image: quay.io/ansible/awx-ee:latest
|
||||
- name: "AWX EE (latest)"
|
||||
image: "quay.io/ansible/awx-ee:latest"
|
||||
- name: "AWX EE ({{ _image_version }})"
|
||||
image: "quay.io/ansible/awx-ee:{{ _image_version }}"
|
||||
|
||||
_control_plane_ee_image: quay.io/ansible/awx-ee:latest
|
||||
_control_plane_ee_image: "quay.io/ansible/awx-ee:{{ _image_version }}"
|
||||
|
||||
_init_container_image: "{{ _control_plane_ee_image.split(':')[0] }}"
|
||||
_init_container_image_version: "{{ _control_plane_ee_image.split(':')[1] }}"
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
set_fact:
|
||||
_custom_init_container_image: "{{ init_container_image }}:{{ init_container_image_version }}"
|
||||
when:
|
||||
- init_container_image | default([]) | length
|
||||
- init_container_image_version is defined or init_container_image_version != ''
|
||||
- init_container_image | default('_undefined',true) != '_undefined'
|
||||
- init_container_image_version | default('_undefined',true) != '_undefined'
|
||||
|
||||
- name: Set Init image URL
|
||||
set_fact:
|
||||
|
||||
@@ -9,7 +9,7 @@ ingress_controller: ''
|
||||
|
||||
set_self_owneref: true
|
||||
|
||||
_control_plane_ee_image: quay.io/ansible/awx-ee:latest
|
||||
_control_plane_ee_image: "quay.io/ansible/awx-ee:{{ lookup('env', 'DEFAULT_AWX_VERSION') or 'latest' }}"
|
||||
_image_pull_policy: Always
|
||||
image_pull_secrets: []
|
||||
|
||||
|
||||
Reference in New Issue
Block a user