From 77e7039a2e903471d46f3712cb01270a0f4870fa Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 07:44:53 -0400 Subject: [PATCH 1/6] Update playbook to allow for deploying custom image version/tag --- ansible/instantiate-awx-deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/instantiate-awx-deployment.yml b/ansible/instantiate-awx-deployment.yml index 3c7b761c..244210e8 100644 --- a/ansible/instantiate-awx-deployment.yml +++ b/ansible/instantiate-awx-deployment.yml @@ -22,6 +22,7 @@ tower_admin_email: test@example.com tower_ingress_type: "{{ tower_ingress_type | default(omit) }}" # Either Route, Ingress or LoadBalancer tower_image: "{{ tower_image | default(omit) }}" + tower_image_version: "{{ tower_image_version | default(omit) }}" development_mode: "{{ development_mode | default(omit) | bool }}" tower_image_pull_policy: "{{ tower_image_pull_policy | default(omit) }}" # tower_ee_images: From c3186115617898767cebb0b3bb814ce1252468de Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 07:45:18 -0400 Subject: [PATCH 2/6] Bump AWX version --- roles/installer/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 9f57030b..0988c12f 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -82,7 +82,7 @@ tower_extra_volumes: '' # Use these image versions for Ansible AWX. tower_image: quay.io/ansible/awx -tower_image_version: 19.0.0 +tower_image_version: 19.1.0 tower_redis_image: docker.io/redis tower_redis_image_version: latest tower_postgres_image: postgres From 3f2bb3e5db3af48538a1d1da7e416b25cfb7cd24 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 08:18:13 -0400 Subject: [PATCH 3/6] Regenerate files --- deploy/awx-operator.yaml | 5 +++++ deploy/crds/awx_v1beta1_crd.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 5e815415..06fe0cca 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -221,9 +221,14 @@ spec: type: string tower_web_extra_env: type: string + tower_ee_extra_volume_mounts: + description: Specify volume mounts to be added to Execution container + type: string tower_task_extra_volume_mounts: + description: Specify volume mounts to be added to Task container type: string tower_web_extra_volume_mounts: + description: Specify volume mounts to be added to the Web container type: string tower_redis_image: description: Registry path to the redis container to use diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index 42efc911..a678bd9e 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -219,9 +219,14 @@ spec: type: string tower_web_extra_env: type: string + tower_ee_extra_volume_mounts: + description: Specify volume mounts to be added to Execution container + type: string tower_task_extra_volume_mounts: + description: Specify volume mounts to be added to Task container type: string tower_web_extra_volume_mounts: + description: Specify volume mounts to be added to the Web container type: string tower_redis_image: description: Registry path to the redis container to use From acb443432e39ee2df41aaa1d96d64619d6e789c2 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 08:18:30 -0400 Subject: [PATCH 4/6] 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 cc78b760..fb44aacd 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.8.0 +operator_version: 0.9.0 pull_policy: Always diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 06fe0cca..a6c795d6 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -479,7 +479,7 @@ spec: serviceAccountName: awx-operator containers: - name: awx-operator - image: "quay.io/ansible/awx-operator:0.8.0" + image: "quay.io/ansible/awx-operator:0.9.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner From 67a650ce383ef1a8653ecef143af462c968ce6c5 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 09:32:09 -0400 Subject: [PATCH 5/6] Remove isolated logger from configmap Isolated nodes have been removed in upstream AWX --- roles/installer/templates/tower_config.yaml.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/installer/templates/tower_config.yaml.j2 b/roles/installer/templates/tower_config.yaml.j2 index c1676949..5a2a19db 100644 --- a/roles/installer/templates/tower_config.yaml.j2 +++ b/roles/installer/templates/tower_config.yaml.j2 @@ -77,7 +77,6 @@ data: LOGGING['loggers']['social']['handlers'] = ['console'] LOGGING['loggers']['system_tracking_migrations']['handlers'] = ['console'] LOGGING['loggers']['rbac_migrations']['handlers'] = ['console'] - LOGGING['loggers']['awx.isolated.manager.playbooks']['handlers'] = ['console'] LOGGING['handlers']['callback_receiver'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['task_system'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['tower_warnings'] = {'class': 'logging.NullHandler'} From ca20dcf05386348333c89c39827dc24c4b91e7c4 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 1 May 2021 09:39:50 -0400 Subject: [PATCH 6/6] Use 'admin' username in tests --- ansible/instantiate-awx-deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/instantiate-awx-deployment.yml b/ansible/instantiate-awx-deployment.yml index 244210e8..f5195185 100644 --- a/ansible/instantiate-awx-deployment.yml +++ b/ansible/instantiate-awx-deployment.yml @@ -18,8 +18,8 @@ metadata: name: awx spec: - tower_admin_user: test - tower_admin_email: test@example.com + tower_admin_user: admin + tower_admin_email: admin@localhost tower_ingress_type: "{{ tower_ingress_type | default(omit) }}" # Either Route, Ingress or LoadBalancer tower_image: "{{ tower_image | default(omit) }}" tower_image_version: "{{ tower_image_version | default(omit) }}"