diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml index 7ca390cf..43fa7493 100644 --- a/config/crd/bases/awx.ansible.com_awxs.yaml +++ b/config/crd/bases/awx.ansible.com_awxs.yaml @@ -758,6 +758,9 @@ spec: init_container_extra_volume_mounts: description: Specify volume mounts to be added to the init container type: string + init_projects_container_image: + description: Registry path to the init projects container to use + type: string postgres_image: description: Registry path to the PostgreSQL container to use type: string diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index 46e0fd94..22733dec 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -687,6 +687,12 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - description: Init Projects Container image to use + displayName: Init Projects Container Image + path: init_projects_container_image + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - description: Secret where can be found the trusted Certificate Authority Bundle path: bundle_cacert_secret x-descriptors: diff --git a/roles/installer/tasks/set_images.yml b/roles/installer/tasks/set_images.yml index 59d86b60..5c75b6cd 100644 --- a/roles/installer/tasks/set_images.yml +++ b/roles/installer/tasks/set_images.yml @@ -17,3 +17,20 @@ {{ _custom_init_container_image | default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) | default(_default_init_container_image, true) }} + +- name: Set default awx init projects container image + set_fact: + _default_init_projects_container_image: "{{ _init_projects_container_image }}" + +- name: Set user provided awx init projects image + set_fact: + _custom_init_projects_container_image: "{{ init_projects_container_image }}" + when: + - init_projects_container_image | default([]) | length + +- name: Set Init projects image URL + set_fact: + _init_projects_container_image: >- + {{ _custom_init_projects_container_image | + default(lookup('env', 'RELATED_IMAGE_AWX_INIT_PROJECTS_CONTAINER')) | + default(_default_init_projects_container_image, true) }}