internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-27 05:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #620 from rooftopcellist/rename-image-vars

Browse Source 
Rename related image vars to be distinct across operators
This commit is contained in:
Shane McDonald
2021-10-27 12:59:02 -04:00
committed by GitHub
parent b866d682ef 29879f7064
commit 09088b5b18
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/manager/manager.yaml
View File

@@ -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

2
roles/backup/tasks/init.yml
View File

@@ -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:

2
roles/installer/tasks/database_configuration.yml
View File

@@ -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

6
roles/installer/tasks/resources_configuration.yml
View File

@@ -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:

2
roles/restore/tasks/init.yml
View File

@@ -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: