Moving towards AWX as the default

deploy/awx-operator.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: tower-operator
+  name: awx-operator
 rules:
   - apiGroups:
       - route.openshift.io
@@ -45,7 +45,7 @@ rules:
   - apiGroups:
       - apps
     resourceNames:
-      - tower-operator
+      - awx-operator
     resources:
       - deployments/finalizers
     verbs:
@@ -64,7 +64,7 @@ rules:
     verbs:
       - get
   - apiGroups:
-      - tower.ansible.com
+      - awx.ansible.com
     resources:
       - '*'
     verbs:
@@ -74,53 +74,53 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: tower-operator
+  name: awx-operator
 subjects:
   - kind: ServiceAccount
-    name: tower-operator
+    name: awx-operator
     namespace: default
 roleRef:
   kind: ClusterRole
-  name: tower-operator
+  name: awx-operator
   apiGroup: rbac.authorization.k8s.io
 
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: tower-operator
+  name: awx-operator
   namespace: default
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: tower-operator
+  name: awx-operator
 spec:
   replicas: 1
   selector:
     matchLabels:
-      name: tower-operator
+      name: awx-operator
   template:
     metadata:
       labels:
-        name: tower-operator
+        name: awx-operator
     spec:
-      serviceAccountName: tower-operator
+      serviceAccountName: awx-operator
       containers:
         - name: ansible
           command:
             - /usr/local/bin/ao-logs
             - /tmp/ansible-operator/runner
             - stdout
-          image: "ansible/tower-operator:0.4.0"
+          image: "ansible/awx-operator:0.4.0"
           imagePullPolicy: "Always"
           volumeMounts:
             - mountPath: /tmp/ansible-operator/runner
               name: runner
               readOnly: true
         - name: operator
-          image: "ansible/tower-operator:0.4.0"
+          image: "ansible/awx-operator:0.4.0"
           imagePullPolicy: "Always"
           volumeMounts:
             - mountPath: /tmp/ansible-operator/runner
@@ -134,7 +134,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
-              value: tower-operator
+              value: awx-operator
       volumes:
         - name: runner
           emptyDir: {}
@@ -143,14 +143,14 @@ spec:
 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: {}
@@ -161,7 +161,7 @@ spec:
       storage: true
   validation:
     openAPIV3Schema:
-      description: Schema validation for the Tower CRD
+      description: Schema validation for the AWX CRD
       type: object
       properties:
         spec:

deploy/crds/tower_v1beta1_tower_cr_awx.yaml

@@ -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

deploy/crds/tower_v1beta1_tower_cr_molecule.yaml

@@ -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

deploy/crds/tower_v1beta1_tower_cr_tower.yaml

@@ -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

deploy/crds/tower_v1beta1_tower_crd.yaml

@@ -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:

deploy/operator.yaml

@@ -2,18 +2,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: tower-operator
+  name: awx-operator
 spec:
   replicas: 1
   selector:
     matchLabels:
-      name: tower-operator
+      name: awx-operator
   template:
     metadata:
       labels:
-        name: tower-operator
+        name: awx-operator
     spec:
-      serviceAccountName: tower-operator
+      serviceAccountName: awx-operator
       containers:
         - name: ansible
           command:
@@ -41,7 +41,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
-              value: tower-operator
+              value: awx-operator
       volumes:
         - name: runner
           emptyDir: {}

deploy/role.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: tower-operator
+  name: awx-operator
 rules:
   - apiGroups:
       - route.openshift.io
@@ -45,7 +45,7 @@ rules:
   - apiGroups:
       - apps
     resourceNames:
-      - tower-operator
+      - awx-operator
     resources:
       - deployments/finalizers
     verbs:
@@ -64,7 +64,7 @@ rules:
     verbs:
       - get
   - apiGroups:
-      - tower.ansible.com
+      - awx.ansible.com
     resources:
       - '*'
     verbs:

deploy/role_binding.yaml

@@ -2,12 +2,12 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: tower-operator
+  name: awx-operator
 subjects:
   - kind: ServiceAccount
-    name: tower-operator
+    name: awx-operator
     namespace: default
 roleRef:
   kind: ClusterRole
-  name: tower-operator
+  name: awx-operator
   apiGroup: rbac.authorization.k8s.io

deploy/service_account.yaml

@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: tower-operator
+  name: awx-operator
   namespace: default