From 3abeec518a5696b0a0051b3aa3d5189e64ebf3c8 Mon Sep 17 00:00:00 2001 From: bartowl Date: Mon, 11 Mar 2024 19:12:10 +0100 Subject: [PATCH] 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> --- .../deploying-a-specific-version-of-awx.md | 18 +++++++++--------- roles/installer/defaults/main.yml | 8 +++++--- roles/installer/tasks/set_images.yml | 4 ++-- roles/mesh_ingress/defaults/main.yml | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md index 62da4e9d..4f81b5c4 100644 --- a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md +++ b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md @@ -2,15 +2,15 @@ There are a few variables that are customizable for awx the image management. -| Name | Description | Default | -| ------------------- | ------------------------- | -------------------------------------- | -| image | Path of the image to pull | quay.io/ansible/awx | -| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | -| image_pull_policy | The pull policy to adopt | IfNotPresent | -| image_pull_secrets | The pull secrets to use | None | -| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:latest | -| redis_image | Path of the image to pull | docker.io/redis | -| redis_image_version | Image version to pull | latest | +| Name | Description | Default | +| ------------------- | ------------------------- | ----------------------------------------- | +| image | Path of the image to pull | quay.io/ansible/awx | +| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | +| image_pull_policy | The pull policy to adopt | IfNotPresent | +| image_pull_secrets | The pull secrets to use | None | +| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | +| redis_image | Path of the image to pull | docker.io/redis | +| redis_image_version | Image version to pull | latest | Example of customization could be: diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 726f2f11..096dc96b 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -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] }}" diff --git a/roles/installer/tasks/set_images.yml b/roles/installer/tasks/set_images.yml index 5c75b6cd..2992610f 100644 --- a/roles/installer/tasks/set_images.yml +++ b/roles/installer/tasks/set_images.yml @@ -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: diff --git a/roles/mesh_ingress/defaults/main.yml b/roles/mesh_ingress/defaults/main.yml index 1540fb24..87ddd9bf 100644 --- a/roles/mesh_ingress/defaults/main.yml +++ b/roles/mesh_ingress/defaults/main.yml @@ -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: []