From 29879f70648d11bdfa5b098e4e2b7e99e6a3fdb2 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 27 Oct 2021 11:26:51 -0400 Subject: [PATCH] Rename related image vars to be distinct across operators --- config/manager/manager.yaml | 8 ++++---- roles/backup/tasks/init.yml | 2 +- roles/installer/tasks/database_configuration.yml | 2 +- roles/installer/tasks/resources_configuration.yml | 6 +++--- roles/restore/tasks/init.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 3e061d9b..1cc8cc7d 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -38,15 +38,15 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: RELATED_IMAGE_APP + - name: RELATED_IMAGE_AWX value: quay.io/ansible/awx:latest - - name: RELATED_IMAGE_INIT_CONTAINER + - name: RELATED_IMAGE_AWX_INIT_CONTAINER value: quay.io/centos/centos:8 - - name: RELATED_IMAGE_REDIS + - name: RELATED_IMAGE_AWX_REDIS value: docker.io/redis:latest - name: RELATED_IMAGE_CONTROL_PLANE_EE value: quay.io/ansible/awx-ee:latest - - name: RELATED_IMAGE_POSTGRES + - name: RELATED_IMAGE_AWX_POSTGRES value: postgres:12 securityContext: allowPrivilegeEscalation: false diff --git a/roles/backup/tasks/init.yml b/roles/backup/tasks/init.yml index 1657edd4..263d751e 100644 --- a/roles/backup/tasks/init.yml +++ b/roles/backup/tasks/init.yml @@ -72,7 +72,7 @@ - name: Set Postgres image URL set_fact: - _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_POSTGRES')) }}" + _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_AWX_POSTGRES')) }}" - name: Create management pod from templated deployment config k8s: diff --git a/roles/installer/tasks/database_configuration.yml b/roles/installer/tasks/database_configuration.yml index 33502476..3cb6a10f 100644 --- a/roles/installer/tasks/database_configuration.yml +++ b/roles/installer/tasks/database_configuration.yml @@ -61,7 +61,7 @@ - name: Set Postgres image URL set_fact: - _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_POSTGRES')) }}" + _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_AWX_POSTGRES')) }}" - block: - name: Create Database configuration diff --git a/roles/installer/tasks/resources_configuration.yml b/roles/installer/tasks/resources_configuration.yml index de5f7b2c..e1c2b8e8 100644 --- a/roles/installer/tasks/resources_configuration.yml +++ b/roles/installer/tasks/resources_configuration.yml @@ -41,7 +41,7 @@ - name: Set AWX App image URL set_fact: - _image: "{{ _custom_image | default(lookup('env', 'RELATED_IMAGE_APP')) }}" + _image: "{{ _custom_image | default(lookup('env', 'RELATED_IMAGE_AWX')) }}" - name: Set user provided controller init image set_fact: @@ -52,7 +52,7 @@ - name: Set Init image URL set_fact: - _init_container_image: "{{ _custom_init_container_image | default(lookup('env', 'RELATED_IMAGE_INIT_CONTAINER')) }}" + _init_container_image: "{{ _custom_init_container_image | default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) }}" - name: Set user provided redis image set_fact: @@ -63,7 +63,7 @@ - name: Set Redis image URL set_fact: - _redis_image: "{{ _custom_redis_image | default(lookup('env', 'RELATED_IMAGE_REDIS')) }}" + _redis_image: "{{ _custom_redis_image | default(lookup('env', 'RELATED_IMAGE_AWX_REDIS')) }}" - name: Set user provided control plane ee image set_fact: diff --git a/roles/restore/tasks/init.yml b/roles/restore/tasks/init.yml index 1f4a58ae..32db8459 100644 --- a/roles/restore/tasks/init.yml +++ b/roles/restore/tasks/init.yml @@ -80,7 +80,7 @@ - name: Set Postgres image URL set_fact: - _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_POSTGRES')) }}" + _postgres_image: "{{ _custom_postgres_image | default(lookup('env', 'RELATED_IMAGE_AWX_POSTGRES')) }}" - name: Create management pod from templated deployment config k8s: