diff --git a/README.md b/README.md index 2a9daa06..fad189f1 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ This environment is meant for headless testing (e.g. in a CI environment, or whe Once the operator is deployed, you can visit the Tower UI in your browser by following these steps: 1. Make sure you have an entry like `IP_ADDRESS example-tower.test` in your `/etc/hosts` file. (Get the IP address with `minikube ip`.) - 2. Visit `http://example-tower.test/` in your browser. + 2. Visit `http://example-tower.test/` in your browser. (Default admin login is `test`/`changeme`.) ### Release Process @@ -148,11 +148,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.5 + operator-sdk build geerlingguy/tower-operator:0.2.6 Then push the generated image to Docker Hub: - docker push geerlingguy/tower-operator:0.2.5 + docker push geerlingguy/tower-operator:0.2.6 #### Build a new version of the `tower-operator.yaml` file diff --git a/build/Dockerfile b/build/Dockerfile index d1de7374..e82b5f1d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ -FROM quay.io/operator-framework/ansible-operator:v0.16.0 +FROM quay.io/operator-framework/ansible-operator:v0.17.0 # Install kubectl. -COPY --from=lachlanevenson/k8s-kubectl:v1.16.5 /usr/local/bin/kubectl /usr/local/bin/kubectl +COPY --from=lachlanevenson/k8s-kubectl:v1.18.3 /usr/local/bin/kubectl /usr/local/bin/kubectl # Install Ansible requirements. COPY requirements.yml ${HOME}/requirements.yml diff --git a/build/chain-operator-files.yml b/build/chain-operator-files.yml index 427a813a..817628ff 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.5 + operator_image: geerlingguy/tower-operator:0.2.6 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 95004099..6752d71b 100644 --- a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml +++ b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml @@ -15,8 +15,8 @@ spec: tower_admin_email: test@example.com tower_admin_password: changeme - tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.3 - tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.3 + tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.4 + tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.4 tower_task_mem_request: 1Gi tower_task_cpu_request: 500m diff --git a/deploy/tower-operator.yaml b/deploy/tower-operator.yaml index b279174b..14d56c16 100644 --- a/deploy/tower-operator.yaml +++ b/deploy/tower-operator.yaml @@ -113,14 +113,14 @@ spec: - /usr/local/bin/ao-logs - /tmp/ansible-operator/runner - stdout - image: "geerlingguy/tower-operator:0.2.5" + image: "geerlingguy/tower-operator:0.2.6" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner name: runner readOnly: true - name: operator - image: "geerlingguy/tower-operator:0.2.5" + image: "geerlingguy/tower-operator:0.2.6" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner diff --git a/roles/tower/defaults/main.yml b/roles/tower/defaults/main.yml index 0a45958d..ec06b098 100644 --- a/roles/tower/defaults/main.yml +++ b/roles/tower/defaults/main.yml @@ -10,8 +10,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.3 -tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.3 +tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.4 +tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.4 # Use these image versions for Ansible AWX. # tower_task_image: ansible/awx_task:9.2.0