Merge pull request #66 from shanemcd/remove-deployment-type

Remove deployment_type

README.md

@@ -29,7 +29,6 @@ Then you can create instances of AWX, for example:
        name: awx
        namespace: ansible-awx
      spec:
-       deployment_type: awx
        tower_admin_user: test
        tower_admin_email: test@example.com
        tower_admin_password: changeme

ansible/group_vars/all

@@ -1,5 +1,3 @@
 operator_image: ansible/awx-operator
 operator_version: 0.5.0
 pull_policy: Always
-operator_file_path: "../deploy/awx-operator.yaml"
-operator_template: "../deploy/operator.yaml"

ansible/instantiate-awx-deployment.yml

@@ -18,7 +18,6 @@
           metadata:
             name: awx
           spec:
-            deployment_type: awx
             tower_admin_user: test
             tower_admin_email: test@example.com
             tower_admin_password: changeme

ansible/templates/crd.yml.j2

@@ -26,9 +26,6 @@ spec:
         spec:
           type: object
           properties:
-            deployment_type:
-              type: string
-              pattern: "^(tower|awx)(-)?.*$"
             external_database:
               type: boolean
               description: |
@@ -51,5 +48,3 @@ spec:
                   username: <username to connect as>
                   password: <password to connect with>
                 type: Opaque
-          required:
-            - deployment_type

ansible/templates/operator.yml.j2

@@ -12,7 +12,6 @@ spec:
     metadata:
       labels:
         name: awx-operator
-        namespace: default
     spec:
       serviceAccountName: awx-operator
       containers:

deploy/awx-operator.yaml

@@ -169,9 +169,6 @@ spec:
         spec:
           type: object
           properties:
-            deployment_type:
-              type: string
-              pattern: "^(tower|awx)(-)?.*$"
             external_database:
               type: boolean
               description: |
@@ -194,5 +191,3 @@ spec:
                   username: <username to connect as>
                   password: <password to connect with>
                 type: Opaque
-          required:
-            - deployment_type

deploy/crds/awx_v1beta1_cr.yaml

@@ -5,7 +5,6 @@ metadata:
   name: example-awx
   namespace: example-awx
 spec:
-  deployment_type: awx
   tower_ingress_type: none
   tower_task_privileged: false
 

deploy/crds/awx_v1beta1_crd.yaml

@@ -26,9 +26,6 @@ spec:
         spec:
           type: object
           properties:
-            deployment_type:
-              type: string
-              pattern: "^(tower|awx)(-)?.*$"
             external_database:
               type: boolean
               description: |
@@ -51,5 +48,3 @@ spec:
                   username: <username to connect as>
                   password: <password to connect with>
                 type: Opaque
-          required:
-            - deployment_type

deploy/crds/awx_v1beta1_molecule.yaml

@@ -5,7 +5,6 @@ metadata:
   name: example-awx
   namespace: example-awx
 spec:
-  deployment_type: awx
   tower_ingress_type: ingress
   tower_task_privileged: false
 

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

@@ -13,7 +13,6 @@ metadata:
             "namespace": "example-awx"
           },
           "spec": {
-            "deployment_type": "awx",
             "tower_admin_email": "test@example.com",
             "tower_admin_password": "changeme",
             "tower_admin_user": "test",
@@ -42,7 +41,6 @@ metadata:
             "namespace": "example-awx"
           },
           "spec": {
-            "deployment_type": "awx",
             "tower_admin_email": "test@example.com",
             "tower_admin_password": "changeme",
             "tower_admin_user": "test",

deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml

@@ -20,9 +20,6 @@ spec:
       properties:
         spec:
           properties:
-            deployment_type:
-              pattern: ^(tower|awx)(-)?.*$
-              type: string
             external_database:
               description: |
                 If true you must supply a secret containing the location and credentials for
@@ -45,8 +42,6 @@ spec:
                   password: <password to connect with>
                 type: Opaque
               type: boolean
-          required:
-            - deployment_type
           type: object
       type: object
   version: v1beta1

molecule/test-local/converge.yml

@@ -26,11 +26,9 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
-
   tasks:
 
     - block:

molecule/test-minikube/converge.yml

@@ -34,11 +34,10 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     # Change this to _awx to test AWX, _tower to test Tower.
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
 
   tasks:
     - block:

roles/awx/tasks/main.yml

@@ -1,7 +1,4 @@
 ---
-- name: Include deployment type vars
-  include_vars: "{{ deployment_type }}.yml"
-
 - name: Check for existing secret key
   k8s_info:
     kind: Secret

roles/awx/vars/awx.yml

@@ -1,2 +0,0 @@
----
-uwsgi_bash: "bash -c"

roles/awx/vars/tower.yml

@@ -1,2 +0,0 @@
----
-uwsgi_bash: "scl enable rh-postgresql10"