diff --git a/README.md b/README.md index 9246c316..71bd3bef 100644 --- a/README.md +++ b/README.md @@ -168,11 +168,11 @@ Each of these must be appropriately built in preparation for a new tag: Run the following command inside this directory: - operator-sdk build ansible/awx-operator:0.4.0 + operator-sdk build ansible/awx-operator:0.5.0 Then push the generated image to Docker Hub: - docker push ansible/awx-operator:0.4.0 + docker push ansible/awx-operator:0.5.0 #### Build a new version of the `awx-operator.yaml` file diff --git a/build/chain-operator-files.yml b/build/chain-operator-files.yml index f624471f..31ee1a42 100644 --- a/build/chain-operator-files.yml +++ b/build/chain-operator-files.yml @@ -6,7 +6,7 @@ gather_facts: false vars: - operator_image: ansible/awx-operator:0.4.0 + operator_image: ansible/awx-operator:0.5.0 pull_policy: Always operator_file_path: "../deploy/awx-operator.yaml" operator_template: "../deploy/operator.yaml" diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 49e15053..583ae9d5 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -114,14 +114,14 @@ spec: - /usr/local/bin/ao-logs - /tmp/ansible-operator/runner - stdout - image: "ansible/awx-operator:0.4.0" + image: "ansible/awx-operator:0.5.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner name: runner readOnly: true - name: operator - image: "ansible/awx-operator:0.4.0" + image: "ansible/awx-operator:0.5.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner @@ -172,7 +172,7 @@ spec: type: string pattern: "^(tower|awx)(-)?.*$" external_database: - type: bool + type: boolean description: | If true you must supply a secret containing the location and credentials for connecting to the external database by a user who has permission to create diff --git a/deploy/crds/awx_v1beta1_cr.yaml b/deploy/crds/awx_v1beta1_cr.yaml index c3d019c5..09e7fd4c 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:14.1.0 - tower_web_image: ansible/awx:14.1.0 + tower_task_image: ansible/awx:15.0.0 + tower_web_image: ansible/awx:15.0.0 tower_task_mem_request: 1Gi tower_task_cpu_request: 500m diff --git a/deploy/crds/awx_v1beta1_molecule.yaml b/deploy/crds/awx_v1beta1_molecule.yaml index d0061a05..da7af132 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:14.1.0 - tower_web_image: ansible/awx:14.1.0 + tower_task_image: ansible/awx:15.0.0 + tower_web_image: ansible/awx:15.0.0 tower_task_mem_request: 128M tower_task_cpu_request: 500m diff --git a/roles/awx/defaults/main.yml b/roles/awx/defaults/main.yml index 2784e0b0..7597bdc8 100644 --- a/roles/awx/defaults/main.yml +++ b/roles/awx/defaults/main.yml @@ -32,9 +32,9 @@ tower_extra_volumes: '' # 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:14.1.0 -tower_web_image: ansible/awx:14.1.0 +tower_task_image: ansible/awx:15.0.0 +tower_web_image: ansible/awx:15.0.0 tower_image_pull_policy: IfNotPresent tower_create_preload_data: true