mirror of
https://github.com/ansible/awx-operator.git
synced 2026-03-26 21:33:14 +00:00
Merge pull request #32 from matburt/15update
Update to AWX 15 and fix a boolean issue
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user