From 76092c366e77cbeb7b15191d6f62935ed1fad4be Mon Sep 17 00:00:00 2001 From: "cbillett83@outlook.com" Date: Wed, 24 Mar 2021 10:02:33 +0000 Subject: [PATCH 1/2] alow private hosted awx-ee image --- README.md | 12 +++++++----- deploy/awx-operator.yaml | 3 +++ deploy/crds/awx_v1beta1_cr.yaml | 2 ++ deploy/crds/awx_v1beta1_crd.yaml | 3 +++ deploy/crds/awx_v1beta1_molecule.yaml | 2 ++ .../awx-operator.clusterserviceversion.yaml | 3 ++- .../manifests/awx.ansible.com_awxs_crd.yaml | 3 +++ roles/installer/defaults/main.yml | 2 +- roles/installer/templates/tower_deployment.yaml.j2 | 2 +- 9 files changed, 24 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index dacb4c47..d6bf18fb 100644 --- a/README.md +++ b/README.md @@ -240,11 +240,12 @@ spec: There are a few variables that are customizable for awx the image management. -| Name | Description | Default | -| ----------------------- | -------------------------- | ------------------ | -| tower_image | Path of the image to pull | ansible/awx:15.0.0 | -| tower_image_pull_policy | The pull policy to adopt | IfNotPresent | -| tower_image_pull_secret | The pull secret to use | '' | +| Name | Description | Default | +| ----------------------- | -------------------------- | -------------------- | +| tower_image | Path of the image to pull | ansible/awx:15.0.0 | +| tower_image_pull_policy | The pull policy to adopt | IfNotPresent | +| tower_image_pull_secret | The pull secret to use | '' | +| tower_ee_image | Path of the image to pull | ansible/awx-ee:latest| Example of customization could be: @@ -255,6 +256,7 @@ spec: tower_image: myorg/my-custom-awx tower_image_pull_policy: Always tower_image_pull_secret: pull_secret_name + tower_ee_image: myorg/my-custom-awx-ee ``` #### Privileged Tasks diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 18a76fa5..67fe3368 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -348,6 +348,9 @@ spec: type: string tower_web_extra_volume_mounts: type: string + tower_ee_image: + description: Registry path to the Execution Environment container to use + type: string tower_redis_image: description: Registry path to the redis container to use type: string diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index dd2708b4..4aa62719 100644 --- a/deploy/crds/awx_v1beta1_cr.yaml +++ b/deploy/crds/awx_v1beta1_cr.yaml @@ -15,6 +15,8 @@ spec: tower_image: quay.io/ansible/awx:18.0.0 + tower_ee_image: quay.io/ansible/awx-ee:latest + tower_create_preload_data: true tower_memcached_image: memcached:alpine diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index b7cd32bc..18e989b8 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -197,6 +197,9 @@ spec: type: string tower_web_extra_volume_mounts: type: string + tower_ee_image: + description: Registry path to the Execution Environment container to use + type: string tower_redis_image: description: Registry path to the redis container to use type: string diff --git a/deploy/crds/awx_v1beta1_molecule.yaml b/deploy/crds/awx_v1beta1_molecule.yaml index 6f4b69a0..dd871445 100644 --- a/deploy/crds/awx_v1beta1_molecule.yaml +++ b/deploy/crds/awx_v1beta1_molecule.yaml @@ -13,6 +13,8 @@ spec: tower_image: quay.io/ansible/awx:18.0.0 + tower_ee_image: quay.io/ansible/awx-ee:latest + tower_web_resource_requirements: requests: cpu: 500m diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index e73702ee..e0906fd3 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -19,6 +19,7 @@ metadata: "tower_hostname": "example-awx.test", "tower_image": "quay.io/ansible/awx:18.0.0", "tower_ingress_type": "none", + "tower_ee_image": "quay.io/ansible/awx-ee:latest", "tower_memcached_image": "memcached:alpine", "tower_postgres_storage_class": "", "tower_redis_image": "redis:latest", @@ -360,7 +361,7 @@ spec: value: awx-operator - name: ANSIBLE_GATHERING value: explicit - image: quay.io/ansible/awx-operator:0.6.0 + image: quay.io/ansible/awx-operator:0.7.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml index 667e0ce3..7a7da681 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml @@ -136,6 +136,9 @@ spec: tower_postgres_storage_class: description: Storage class to use for the PostgreSQL PVC type: string + tower_ee_image: + description: Registry path to the Execution Environment container to use + type: string tower_redis_image: description: Registry path to the redis container to use type: string diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 76f9fadd..d824c0a0 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -68,7 +68,7 @@ tower_extra_volumes: '' tower_image: quay.io/ansible/awx:18.0.0 tower_image_pull_policy: IfNotPresent tower_image_pull_secret: '' -default_ee: quay.io/ansible/awx-ee +tower_ee_image: quay.io/ansible/awx-ee tower_create_preload_data: true diff --git a/roles/installer/templates/tower_deployment.yaml.j2 b/roles/installer/templates/tower_deployment.yaml.j2 index 9d7b16c4..53937d0d 100644 --- a/roles/installer/templates/tower_deployment.yaml.j2 +++ b/roles/installer/templates/tower_deployment.yaml.j2 @@ -167,7 +167,7 @@ spec: {{ tower_task_extra_env | indent(width=12, indentfirst=True) }} {% endif %} resources: {{ tower_task_resource_requirements }} - - image: '{{ default_ee }}' + - image: '{{ tower_ee_image }}' name: '{{ meta.name }}-ee' imagePullPolicy: '{{ tower_image_pull_policy }}' args: ['receptor', '--config', '/etc/receptor.conf'] From 60479971b8cac5f2245ee71c78cf7f91cc9b88f4 Mon Sep 17 00:00:00 2001 From: "cbillett83@outlook.com" Date: Wed, 24 Mar 2021 10:19:14 +0000 Subject: [PATCH 2/2] resolve build failure --- deploy/crds/awx_v1beta1_cr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index 4aa62719..f91d5507 100644 --- a/deploy/crds/awx_v1beta1_cr.yaml +++ b/deploy/crds/awx_v1beta1_cr.yaml @@ -16,7 +16,7 @@ spec: tower_image: quay.io/ansible/awx:18.0.0 tower_ee_image: quay.io/ansible/awx-ee:latest - + tower_create_preload_data: true tower_memcached_image: memcached:alpine