diff --git a/build/test-framework/Dockerfile b/build/test-framework/Dockerfile index 3620882b..a8fee085 100644 --- a/build/test-framework/Dockerfile +++ b/build/test-framework/Dockerfile @@ -3,7 +3,7 @@ FROM ${BASEIMAGE} USER 0 RUN yum install -y python-devel gcc libffi-devel -RUN pip install molecule==2.20.1 +RUN pip install molecule==2.20.1 jmespath ARG NAMESPACEDMAN ADD $NAMESPACEDMAN /namespaced.yaml diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index 6ca69b93..8e250018 100644 --- a/deploy/crds/awx_v1beta1_cr.yaml +++ b/deploy/crds/awx_v1beta1_cr.yaml @@ -16,8 +16,8 @@ spec: tower_admin_email: test@example.com tower_admin_password: changeme - tower_task_image: ansible/awx:13.0.0 - tower_web_image: ansible/awx:13.0.0 + tower_task_image: ansible/awx:14.0.0 + tower_web_image: ansible/awx:14.0.0 tower_task_mem_request: 1Gi tower_task_cpu_request: 500m diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index 4b43674f..d0fafcca 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -38,7 +38,7 @@ spec: The secret should have the name: -postgres-configuration and should look like: - + apiVersion: v1 kind: Secret metadata: diff --git a/deploy/crds/awx_v1beta1_molecule.yaml b/deploy/crds/awx_v1beta1_molecule.yaml index 01583a0e..943a9be6 100644 --- a/deploy/crds/awx_v1beta1_molecule.yaml +++ b/deploy/crds/awx_v1beta1_molecule.yaml @@ -16,8 +16,8 @@ spec: tower_admin_email: test@example.com tower_admin_password: changeme - tower_task_image: ansible/awx:13.0.0 - tower_web_image: ansible/awx:13.0.0 + tower_task_image: ansible/awx:14.0.0 + tower_web_image: ansible/awx:14.0.0 tower_task_mem_request: 128M tower_task_cpu_request: 500m diff --git a/deploy/role_binding.yaml b/deploy/role_binding.yaml index 50feae1c..c2c64a87 100644 --- a/deploy/role_binding.yaml +++ b/deploy/role_binding.yaml @@ -6,6 +6,7 @@ metadata: subjects: - kind: ServiceAccount name: awx-operator + namespace: default roleRef: kind: ClusterRole name: awx-operator diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 375272af..63c841d6 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -10,7 +10,7 @@ tasks: - name: Create Custom Resource Definition k8s: - definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_crd.yaml'])) }}" + definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_crd.yaml'])) }}" - name: Ensure specified namespace is present k8s: diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index 7d9418db..58f94183 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -26,7 +26,7 @@ deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy" pull_policy: Never operator_image: awx.ansible.com/awx-operator:testing - custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_cr_molecule.yaml'])) | from_yaml }}" + custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}" tasks: diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml index e2540a31..c0c56596 100644 --- a/molecule/test-minikube/converge.yml +++ b/molecule/test-minikube/converge.yml @@ -35,7 +35,7 @@ pull_policy: Never operator_image: awx.ansible.com/awx-operator:testing # Change this to _awx to test AWX, _tower to test Tower. - custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_cr_awx.yaml'])) | from_yaml }}" + custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}" tasks: - block: diff --git a/roles/awx/defaults/main.yml b/roles/awx/defaults/main.yml index 987a6239..0a35b489 100644 --- a/roles/awx/defaults/main.yml +++ b/roles/awx/defaults/main.yml @@ -11,12 +11,12 @@ tower_admin_password: changeme tower_broadcast_websocket_secret: changeme # Use these image versions for Ansible Tower. -#tower_task_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0 -#tower_web_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0 +# tower_task_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0 +# tower_web_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0 # Use these image versions for Ansible AWX. -tower_task_image: ansible/awx:13.0.0 -tower_web_image: ansible/awx:13.0.0 +tower_task_image: ansible/awx:14.0.0 +tower_web_image: ansible/awx:14.0.0 tower_create_preload_data: true diff --git a/roles/awx/tasks/main.yml b/roles/awx/tasks/main.yml index 922d5bab..9c0733bc 100644 --- a/roles/awx/tasks/main.yml +++ b/roles/awx/tasks/main.yml @@ -13,7 +13,7 @@ k8s_info: kind: Secret namespace: '{{ meta.namespace }}' - name: '{{meta.name }}-postgres-configuration' + name: '{{ meta.name }}-postgres-configuration' register: postgres_config_resources - name: Create Database configuration if it doesn't already exist @@ -51,7 +51,6 @@ definition: "{{ lookup('template', 'tower_secret.yaml.j2') }}" register: k8s_tower_secret_result when: secret_key_resources['resources'] | length < 1 - - name: Ensure configured AWX resources exist in the cluster. k8s: diff --git a/roles/awx_remove/tasks/main.yml b/roles/awx_remove/tasks/main.yml index e7706084..133c0901 100644 --- a/roles/awx_remove/tasks/main.yml +++ b/roles/awx_remove/tasks/main.yml @@ -1,5 +1,4 @@ - - +--- - name: Check for existing secret key k8s_info: kind: Secret @@ -11,7 +10,7 @@ k8s_info: kind: Secret namespace: '{{ meta.namespace }}' - name: '{{meta.name }}-postgres-configuration' + name: '{{ meta.name }}-postgres-configuration' register: postgres_config_resources - name: Remove ownerReferences from PG configuration if it exists