From 385a4f65a1cd7e67ec2e70f6de3cfbbaec1ec461 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 23 Mar 2021 11:07:09 -0400 Subject: [PATCH 1/3] Bump version --- ansible/group_vars/all | 2 +- deploy/awx-operator.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 13b5706d..03348228 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -1,3 +1,3 @@ operator_image: quay.io/ansible/awx-operator -operator_version: 0.6.0 +operator_version: 0.7.0 pull_policy: Always diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 62ebba5d..fee8caa8 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -122,7 +122,7 @@ spec: serviceAccountName: awx-operator containers: - name: awx-operator - image: "quay.io/ansible/awx-operator:0.6.0" + image: "quay.io/ansible/awx-operator:0.7.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner From 693ce5a17ecb44c00264cea66922c5621ec1592e Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 23 Mar 2021 11:11:55 -0400 Subject: [PATCH 2/3] Fix CRD Fallout from https://github.com/ansible/awx-operator/pull/128 --- ansible/templates/crd.yml.j2 | 2 +- deploy/awx-operator.yaml | 2 +- deploy/crds/awx_v1beta1_crd.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index 33241d98..b7cd32bc 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -85,7 +85,7 @@ spec: - https tower_loadbalancer_port: description: Port to use for the loadbalancer - type: int32 + type: integer default: 80 tower_route_host: description: The DNS to use to points to the instance diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index fee8caa8..18a76fa5 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -236,7 +236,7 @@ spec: - https tower_loadbalancer_port: description: Port to use for the loadbalancer - type: number + type: integer default: 80 tower_route_host: description: The DNS to use to points to the instance diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index 1d1bbc9c..b7cd32bc 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -85,7 +85,7 @@ spec: - https tower_loadbalancer_port: description: Port to use for the loadbalancer - type: number + type: integer default: 80 tower_route_host: description: The DNS to use to points to the instance From 62ec946e4f65415ebab40853289e3ac8a2b791b3 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 23 Mar 2021 11:14:56 -0400 Subject: [PATCH 3/3] Use latest version of quay.io/ansible/awx --- deploy/crds/awx_v1beta1_cr.yaml | 2 +- deploy/crds/awx_v1beta1_molecule.yaml | 2 +- .../manifests/awx-operator.clusterserviceversion.yaml | 4 ++-- roles/installer/defaults/main.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index bc1ae23c..dd2708b4 100644 --- a/deploy/crds/awx_v1beta1_cr.yaml +++ b/deploy/crds/awx_v1beta1_cr.yaml @@ -13,7 +13,7 @@ spec: tower_admin_user: test tower_admin_email: test@example.com - tower_image: quay.io/ansible/awx:execution-environments + tower_image: quay.io/ansible/awx:18.0.0 tower_create_preload_data: true diff --git a/deploy/crds/awx_v1beta1_molecule.yaml b/deploy/crds/awx_v1beta1_molecule.yaml index 7ba58551..6f4b69a0 100644 --- a/deploy/crds/awx_v1beta1_molecule.yaml +++ b/deploy/crds/awx_v1beta1_molecule.yaml @@ -11,7 +11,7 @@ spec: tower_admin_email: test@example.com - tower_image: quay.io/ansible/awx:execution-environments + tower_image: quay.io/ansible/awx:18.0.0 tower_web_resource_requirements: requests: 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 bb2edd98..e73702ee 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -17,7 +17,7 @@ metadata: "tower_broadcast_websocket_secret": "changeme", "tower_create_preload_data": true, "tower_hostname": "example-awx.test", - "tower_image": "quay.io/ansible/awx:execution-environments", + "tower_image": "quay.io/ansible/awx:18.0.0", "tower_ingress_type": "none", "tower_memcached_image": "memcached:alpine", "tower_postgres_storage_class": "", @@ -37,7 +37,7 @@ metadata: "tower_admin_email": "test@example.com", "tower_broadcast_websocket_secret": "changeme", "tower_create_preload_data": true, - "tower_image": "quay.io/ansible/awx:execution-environments", + "tower_image": "quay.io/ansible/awx:18.0.0", "tower_ingress_type": "ingress", "tower_memcached_image": "memcached:alpine", "tower_postgres_image": "postgres:12", diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 4e6c1786..76f9fadd 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -65,7 +65,7 @@ tower_extra_volumes: '' # Use these image versions for Ansible AWX. -tower_image: quay.io/ansible/awx:execution-environments +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