Merge pull request #138 from shanemcd/bump-18

Bump version / update default AWX image / fix CRD

ansible/group_vars/all

@@ -1,3 +1,3 @@
 operator_image: quay.io/ansible/awx-operator
-operator_version: 0.6.0
+operator_version: 0.7.0
 pull_policy: Always

ansible/templates/crd.yml.j2

@@ -85,7 +85,7 @@ spec:
                     - https
                 tower_loadbalancer_port:
                   description: Port to use for the loadbalancer
-                  type: int32
+                  type: integer
                   default: 80
                 tower_route_host:
                   description: The DNS to use to points to the instance

deploy/awx-operator.yaml

@@ -122,7 +122,7 @@ spec:
       serviceAccountName: awx-operator
       containers:
         - name: awx-operator
-          image: "quay.io/ansible/awx-operator:0.6.0"
+          image: "quay.io/ansible/awx-operator:0.7.0"
           imagePullPolicy: "Always"
           volumeMounts:
             - mountPath: /tmp/ansible-operator/runner
@@ -236,7 +236,7 @@ spec:
                     - https
                 tower_loadbalancer_port:
                   description: Port to use for the loadbalancer
-                  type: number
+                  type: integer
                   default: 80
                 tower_route_host:
                   description: The DNS to use to points to the instance

deploy/crds/awx_v1beta1_cr.yaml

@@ -13,7 +13,7 @@ spec:
   tower_admin_user: test
   tower_admin_email: [email protected]
 
-  tower_image: quay.io/ansible/awx:execution-environments
+  tower_image: quay.io/ansible/awx:18.0.0
 
   tower_create_preload_data: true
 

deploy/crds/awx_v1beta1_crd.yaml

@@ -85,7 +85,7 @@ spec:
                     - https
                 tower_loadbalancer_port:
                   description: Port to use for the loadbalancer
-                  type: number
+                  type: integer
                   default: 80
                 tower_route_host:
                   description: The DNS to use to points to the instance

deploy/crds/awx_v1beta1_molecule.yaml

@@ -11,7 +11,7 @@ spec:
 
   tower_admin_email: [email protected]
 
-  tower_image: quay.io/ansible/awx:execution-environments
+  tower_image: quay.io/ansible/awx:18.0.0
 
   tower_web_resource_requirements:
     requests:

deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml

@@ -17,7 +17,7 @@ metadata:
             "tower_broadcast_websocket_secret": "changeme",
             "tower_create_preload_data": true,
             "tower_hostname": "example-awx.test",
-            "tower_image": "quay.io/ansible/awx:execution-environments",
+            "tower_image": "quay.io/ansible/awx:18.0.0",
             "tower_ingress_type": "none",
             "tower_memcached_image": "memcached:alpine",
             "tower_postgres_storage_class": "",
@@ -37,7 +37,7 @@ metadata:
             "tower_admin_email": "[email protected]",
             "tower_broadcast_websocket_secret": "changeme",
             "tower_create_preload_data": true,
-            "tower_image": "quay.io/ansible/awx:execution-environments",
+            "tower_image": "quay.io/ansible/awx:18.0.0",
             "tower_ingress_type": "ingress",
             "tower_memcached_image": "memcached:alpine",
             "tower_postgres_image": "postgres:12",

roles/installer/defaults/main.yml

@@ -65,7 +65,7 @@ tower_extra_volumes: ''
 
 # Use these image versions for Ansible AWX.
 
-tower_image: quay.io/ansible/awx:execution-environments
+tower_image: quay.io/ansible/awx:18.0.0
 tower_image_pull_policy: IfNotPresent
 tower_image_pull_secret: ''
 default_ee: quay.io/ansible/awx-ee