Moving towards AWX as the default

This commit is contained in:
Matthew Jones
2020-07-01 14:15:51 -04:00
parent 3362821d03
commit ff9a153f87
31 changed files with 156 additions and 157 deletions

View File

@@ -1,15 +1,15 @@
---
apiVersion: tower.ansible.com/v1beta1
kind: Tower
apiVersion: awx.ansible.com/v1beta1
kind: AWX
metadata:
name: example-tower
namespace: example-tower
name: example-awx
namespace: example-awx
spec:
deployment_type: awx
tower_ingress_type: none
tower_task_privileged: false
tower_hostname: example-tower.test
tower_hostname: example-awx.test
tower_secret_key: aabbcc
tower_broadcast_websocket_secret: changeme
@@ -17,8 +17,8 @@ spec:
tower_admin_email: test@example.com
tower_admin_password: changeme
tower_task_image: ansible/awx_task:11.2.0
tower_web_image: ansible/awx_web:11.2.0
tower_task_image: ansible/awx:13.0.0
tower_web_image: ansible/awx:13.0.0
tower_task_mem_request: 1Gi
tower_task_cpu_request: 500m

View File

@@ -1,15 +1,15 @@
---
apiVersion: tower.ansible.com/v1beta1
kind: Tower
apiVersion: awx.ansible.com/v1beta1
kind: AWX
metadata:
name: example-tower
namespace: example-tower
name: example-awx
namespace: example-awx
spec:
deployment_type: awx
tower_ingress_type: ingress
tower_task_privileged: false
tower_hostname: example-tower.test
tower_hostname: example-awx.test
tower_secret_key: aabbcc
tower_broadcast_websocket_secret: changeme
@@ -17,8 +17,8 @@ spec:
tower_admin_email: test@example.com
tower_admin_password: changeme
tower_task_image: ansible/awx_task:11.2.0
tower_web_image: ansible/awx_web:11.2.0
tower_task_image: ansible/awx:13.0.0
tower_web_image: ansible/awx:13.0.0
tower_task_mem_request: 128M
tower_task_cpu_request: 500m

View File

@@ -1,6 +1,6 @@
---
apiVersion: tower.ansible.com/v1beta1
kind: Tower
apiVersion: awx.ansible.com/v1beta1
kind: AWX
metadata:
name: example-tower
namespace: example-tower

View File

@@ -2,14 +2,14 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: towers.tower.ansible.com
name: awxs.awx.ansible.com
spec:
group: tower.ansible.com
group: awx.ansible.com
names:
kind: Tower
listKind: TowerList
plural: towers
singular: tower
kind: AWX
listKind: AWXList
plural: awxs
singular: awx
scope: Namespaced
subresources:
status: {}
@@ -20,7 +20,7 @@ spec:
storage: true
validation:
openAPIV3Schema:
description: Schema validation for the Tower CRD
description: Schema validation for the AWX CRD
type: object
properties:
spec: