From 83e46ee84bd792992b46b907115bdf83061d21b1 Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza Date: Wed, 2 Jun 2021 14:55:53 +0200 Subject: [PATCH] Use own attribute for control_plane_ee Signed-off-by: Julen Landa Alustiza --- ansible/templates/crd.yml.j2 | 3 +++ deploy/awx-operator.yaml | 3 +++ deploy/crds/awx_v1beta1_crd.yaml | 3 +++ roles/installer/defaults/main.yml | 2 ++ roles/installer/templates/deployment.yaml.j2 | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index c5959286..99a8c0fa 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -149,6 +149,9 @@ spec: type: string image: type: string + control_plane_ee_image: + description: Registry path to the Execution Environment container image to use on control plane pods + type: string image_pull_policy: description: The image pull policy type: string diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 97160ed4..a77b08f1 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -151,6 +151,9 @@ spec: type: string image: type: string + control_plane_ee_image: + description: Registry path to the Execution Environment container image to use on control plane pods + type: string image_pull_policy: description: The image pull policy type: string diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index c5959286..99a8c0fa 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -149,6 +149,9 @@ spec: type: string image: type: string + control_plane_ee_image: + description: Registry path to the Execution Environment container image to use on control plane pods + type: string image_pull_policy: description: The image pull policy type: string diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 59f6ecea..15775363 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -114,6 +114,8 @@ ee_images: - name: AWX EE 0.3.0 image: quay.io/ansible/awx-ee:0.3.0 +control_plane_ee_image: quay.io/ansible/awx-ee:0.3.0 + create_preload_data: true replicas: "1" diff --git a/roles/installer/templates/deployment.yaml.j2 b/roles/installer/templates/deployment.yaml.j2 index 349960f0..6f53a2b3 100644 --- a/roles/installer/templates/deployment.yaml.j2 +++ b/roles/installer/templates/deployment.yaml.j2 @@ -205,7 +205,7 @@ spec: {{ task_extra_env | indent(width=12, indentfirst=True) }} {% endif %} resources: {{ task_resource_requirements }} - - image: '{{ ee_images[0].image }}' + - image: '{{ control_plane_ee_image }}' name: '{{ meta.name }}-ee' imagePullPolicy: '{{ image_pull_policy }}' args: ['receptor', '--config', '/etc/receptor.conf']