Merge pull request #409 from shanemcd/bump-0.11.0

AWX Operator 0.11.0
ansible · Jun 17, 2021 · 1fb429b · 1fb429b
2 parents d834701 + 4d027c7
commit 1fb429b
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -725,33 +725,6 @@ There are a few moving parts to this project:
 
 Each of these must be appropriately built in preparation for a new tag:
 
-### Verify Functionality
-
-Run the following command inside this directory:
-
-```sh
-#> operator-sdk build quay.io/<user>/awx-operator:test
-```
-
-Then push the generated image to Docker Hub:
-
-```sh
-#> docker push quay.io/<user>/awx-operator:test
-```
-
-After it is built, test it on a local cluster:
-
-
-```sh
-#> minikube start --memory 6g --cpus 4
-#> minikube addons enable ingress
-#> ansible-playbook ansible/deploy-operator.yml -e operator_image=quay.io/<user>/awx-operator -e operator_version=test
-#> kubectl create namespace example-awx
-#> ansible-playbook ansible/instantiate-awx-deployment.yml -e namespace=example-awx
-#> <test everything>
-#> minikube delete
-```
-
 ### Update version and files
 
 Update the awx-operator version:
@@ -774,6 +747,34 @@ $ operator-sdk generate bundle --operator-name awx-operator --version <new_tag>
 
 > It is a good idea to use the [build script](./build.sh) at this point to build the catalog and test out installing it in Operator Hub.
 
+### Verify Functionality
+
+Run the following command inside this directory:
+
+```sh
+#> operator-sdk build quay.io/<user>/awx-operator:<new-version>
+```
+
+Then push the generated image to Docker Hub:
+
+```sh
+#> docker push quay.io/<user>/awx-operator:<new-version>
+```
+
+After it is built, test it on a local cluster:
+
+
+```sh
+#> minikube start --memory 6g --cpus 4
+#> minikube addons enable ingress
+#> ansible-playbook ansible/deploy-operator.yml -e operator_image=quay.io/<user>/awx-operator -e operator_version=<new-version> -e pull_policy=Always
+#> kubectl create namespace example-awx
+#> ansible-playbook ansible/instantiate-awx-deployment.yml -e namespace=example-awx -e image=quay.io/<user>/awx -e service_type=nodeport
+#> # Verify that the awx-task and awx-web containers are launched 
+#> # with the right version of the awx image
+#> minikube delete
+```
+
 ### Update changelog
 
 Generate a list of commits between the versions and add it to the [changelog](./CHANGELOG.md).

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -1,4 +1,4 @@
 operator_image: quay.io/ansible/awx-operator
-operator_version: 0.10.0
+operator_version: 0.11.0
 pull_policy: Always
 ansible_debug_logs: "false"
diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml
@@ -711,7 +711,7 @@ spec:
       serviceAccountName: awx-operator
       containers:
         - name: awx-operator
-          image: "quay.io/ansible/awx-operator:0.10.0"
+          image: "quay.io/ansible/awx-operator:0.11.0"
           imagePullPolicy: "Always"
           volumeMounts:
             - mountPath: /tmp/ansible-operator/runner
@@ -729,7 +729,7 @@ spec:
             - name: ANSIBLE_GATHERING
               value: explicit
             - name: OPERATOR_VERSION
-              value: "0.10.0"
+              value: "0.11.0"
             - name: ANSIBLE_DEBUG_LOGS
               value: "false"
           livenessProbe:

diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
@@ -13,14 +13,14 @@ metadata:
           },
           "spec": {
             "deployment_type": "awx",
-            "ingress_type": "ingress",
-            "service_account_annotations": "foo: bar\n",
             "ee_resource_requirements": {
               "requests": {
                 "cpu": "200m",
                 "memory": "64M"
               }
             },
+            "ingress_type": "ingress",
+            "service_account_annotations": "foo: bar\n",
             "task_resource_requirements": {
               "requests": {
                 "cpu": "500m",
@@ -39,7 +39,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v0.19.4
     operators.operatorframework.io/project_layout: ansible
-  name: awx-operator.v0.10.0
+  name: awx-operator.v0.11.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -467,7 +467,8 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:hidden
-      - description: Registry path to the Execution Environment container to use on control plane pods
+      - description: Registry path to the Execution Environment container to use on
+          control plane pods
         displayName: Control Plane EE Image
         path: control_plane_ee_image
         x-descriptors:
@@ -677,10 +678,10 @@ spec:
                 - name: ANSIBLE_GATHERING
                   value: explicit
                 - name: OPERATOR_VERSION
-                  value: 0.10.0
+                  value: 0.11.0
                 - name: ANSIBLE_DEBUG_LOGS
                   value: "false"
-                image: quay.io/ansible/awx-operator:0.10.0
+                image: quay.io/ansible/awx-operator:0.11.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -719,5 +720,5 @@ spec:
   provider:
     name: AWX Community
     url: https://github.com/ansible/awx-operator
-  replaces: awx-operator.v0.0.1
-  version: 0.10.0
+  replaces: awx-operator.v0.10.0
+  version: 0.11.0
diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml
@@ -72,7 +72,7 @@ spec:
                 type: array
               restoreComplete:
                 description: Restore process complete
-                type: string
+                type: boolean
             type: object
         type: object
         x-kubernetes-preserve-unknown-fields: true

diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
@@ -38,6 +38,10 @@ spec:
               ca_trust_bundle:
                 description: Path where the trusted CA bundle is available
                 type: string
+              control_plane_ee_image:
+                description: Registry path to the Execution Environment container
+                  image to use on control plane pods
+                type: string
               create_preload_data:
                 default: true
                 description: Whether or not to preload data upon instance creation
@@ -48,6 +52,8 @@ spec:
               development_mode:
                 description: If the deployment should be done in development mode
                 type: boolean
+              ee_extra_env:
+                type: string
               ee_extra_volume_mounts:
                 description: Specify volume mounts to be added to Execution container
                 type: string
@@ -62,8 +68,12 @@ spec:
                       type: string
                   type: object
                 type: array
+              ee_pull_credentials_secret:
+                description: Secret where pull credentials for registered ees can
+                  be found
+                type: string
               ee_resource_requirements:
-                description: Resource requirements for the ee control plane container
+                description: Resource requirements for the ee container
                 properties:
                   limits:
                     properties:
@@ -84,14 +94,6 @@ spec:
                         type: string
                     type: object
                 type: object
-              ee_extra_env:
-                type: string
-              ee_pull_credentials_secret:
-                description: Secret where pull credentials for registered ees can be found
-                type: string
-              control_plane_ee_image:
-                description: Registry path to the Execution Environment container image to use on control plane pods
-                type: string
               extra_settings:
                 description: Extra settings to specify for the API
                 items:

diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml
@@ -106,7 +106,7 @@ extra_volumes: ''
 # Use these image versions for Ansible AWX.
 
 image: quay.io/ansible/awx
-image_version: 19.2.0
+image_version: 19.2.1
 redis_image: docker.io/redis
 redis_image_version: latest
 postgres_image: postgres
@@ -115,10 +115,10 @@ image_pull_policy: IfNotPresent
 image_pull_secret: ''
 
 ee_images:
-  - name: AWX EE 0.3.0
-    image: quay.io/ansible/awx-ee:0.3.0
+  - name: AWX EE 0.4.0
+    image: quay.io/ansible/awx-ee:0.4.0
 
-control_plane_ee_image: quay.io/ansible/awx-ee:0.3.0
+control_plane_ee_image: quay.io/ansible/awx-ee:0.4.0
 
 create_preload_data: true