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 19bcb52..91a9741 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 @@ -36,4 +36,4 @@ spec: init_projects_container_image: myorg/my-mirrored-centos:stream9 ``` -**Note**: The `image` and `image_version` are intended for local mirroring scenarios. `DEFAULT_AWX_VERSION` controls the main Ascender image tag, but the bundled execution environment defaults remain pinned to `ghcr.io/ctrliq/ascender-ee:latest` unless you override them explicitly. For the current defaults, check [roles/installer/defaults/main.yml](/home/weyerkaa/ascender-operator/roles/installer/defaults/main.yml). +**Note**: The `image` and `image_version` are intended for local mirroring scenarios. `DEFAULT_AWX_VERSION` controls the main Ascender image tag and we are now changing the execution environment default to the same pinned release for `ghcr.io/ctrliq/ascender-ee` unless you override them explicitly. For the current defaults, check [roles/installer/defaults/main.yml](/home/weyerkaa/ascender-operator/roles/installer/defaults/main.yml). diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index d2e8307..473b31e 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -283,10 +283,10 @@ init_container_extra_commands: '' init_container_extra_volume_mounts: '' ee_images: - - name: "Ascender EE (latest)" - image: "ghcr.io/ctrliq/ascender-ee:latest" + - name: "Ascender EE ({{ _image_version }})" + image: "ghcr.io/ctrliq/ascender-ee:{{ _image_version }}" -_control_plane_ee_image: "ghcr.io/ctrliq/ascender-ee:latest" +_control_plane_ee_image: "ghcr.io/ctrliq/ascender-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/mesh_ingress/defaults/main.yml b/roles/mesh_ingress/defaults/main.yml index b7cab02..1621e93 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: "ghcr.io/ctrliq/ascender-ee:latest" +_control_plane_ee_image: "ghcr.io/ctrliq/ascender-ee:{{ lookup('env', 'DEFAULT_AWX_VERSION') or 'latest' }}" _image_pull_policy: Always image_pull_secrets: []