From 24e63fed001fc3c0a29310008a89a26e47036037 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 16 Dec 2019 09:54:19 -0600 Subject: [PATCH] Update to Tower 3.6.2. Update operator to version 0.2.1. --- README.md | 4 ++-- build/chain-operator-files.yml | 2 +- deploy/crds/tower_v1alpha1_tower_cr_tower.yaml | 4 ++-- deploy/tower-operator.yaml | 4 ++-- roles/tower/defaults/main.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 39bc037f..8025b743 100644 --- a/README.md +++ b/README.md @@ -121,11 +121,11 @@ Each of these must be appropriately built in preparation for a new tag: Run the following command inside this directory: - operator-sdk build geerlingguy/tower-operator:0.2.0 + operator-sdk build geerlingguy/tower-operator:0.2.1 Then push the generated image to Docker Hub: - docker push geerlingguy/tower-operator:0.2.0 + docker push geerlingguy/tower-operator:0.2.1 #### Build a new version of the `tower-operator.yaml` file diff --git a/build/chain-operator-files.yml b/build/chain-operator-files.yml index c0417a90..929fa64e 100644 --- a/build/chain-operator-files.yml +++ b/build/chain-operator-files.yml @@ -6,7 +6,7 @@ gather_facts: false vars: - operator_image: geerlingguy/tower-operator:0.2.0 + operator_image: geerlingguy/tower-operator:0.2.1 pull_policy: Always operator_file_path: "../deploy/tower-operator.yaml" operator_template: "../deploy/operator.yaml" diff --git a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml index 2ad40b71..4792d3a6 100644 --- a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml +++ b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml @@ -11,8 +11,8 @@ spec: tower_admin_email: test@example.com tower_admin_password: changeme - tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.1 - tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.1 + tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.2 + tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.2 tower_task_mem_request: 1Gi tower_task_cpu_request: 500m diff --git a/deploy/tower-operator.yaml b/deploy/tower-operator.yaml index 85ed77c0..e4c60de6 100644 --- a/deploy/tower-operator.yaml +++ b/deploy/tower-operator.yaml @@ -124,14 +124,14 @@ spec: - /usr/local/bin/ao-logs - /tmp/ansible-operator/runner - stdout - image: "geerlingguy/tower-operator:0.2.0" + image: "geerlingguy/tower-operator:0.2.1" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner name: runner readOnly: true - name: operator - image: "geerlingguy/tower-operator:0.2.0" + image: "geerlingguy/tower-operator:0.2.1" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner diff --git a/roles/tower/defaults/main.yml b/roles/tower/defaults/main.yml index efdbe699..3a58ad87 100644 --- a/roles/tower/defaults/main.yml +++ b/roles/tower/defaults/main.yml @@ -7,8 +7,8 @@ tower_admin_email: test@example.com tower_admin_password: changeme # Use these image versions for Ansible Tower. -tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.1 -tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.1 +tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.2 +tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.2 # Use these image versions for Ansible AWX. # tower_task_image: ansible/awx_task:9.0.1