Deployment type: Make more fields dynamic based on that field

ansible/templates/crd.yml.j2

@@ -26,6 +26,15 @@ spec:
                 deployment_type:
                   description: Name of the deployment type
                   type: string
+                  default: awx
+                kind:
+                  description: Kind of the deployment type
+                  type: string
+                  default: AWX
+                api_version:
+                  description: apiVersion of the deployment type
+                  type: string
+                  default: awx.ansible.com/v1beta1
                 tower_task_privileged:
                   description: If a privileged security context should be enabled
                   type: boolean

deploy/awx-operator.yaml

@@ -28,6 +28,15 @@ spec:
                 deployment_type:
                   description: Name of the deployment type
                   type: string
+                  default: awx
+                kind:
+                  description: Kind of the deployment type
+                  type: string
+                  default: AWX
+                api_version:
+                  description: apiVersion of the deployment type
+                  type: string
+                  default: awx.ansible.com/v1beta1
                 tower_task_privileged:
                   description: If a privileged security context should be enabled
                   type: boolean

deploy/crds/awx_v1beta1_crd.yaml

@@ -26,6 +26,15 @@ spec:
                 deployment_type:
                   description: Name of the deployment type
                   type: string
+                  default: awx
+                kind:
+                  description: Kind of the deployment type
+                  type: string
+                  default: AWX
+                api_version:
+                  description: apiVersion of the deployment type
+                  type: string
+                  default: awx.ansible.com/v1beta1
                 tower_task_privileged:
                   description: If a privileged security context should be enabled
                   type: boolean

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

@@ -204,6 +204,16 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:hidden
+      - displayName: Deployment Kind
+        path: kind
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:advanced
+        - urn:alm:descriptor:com.tectonic.ui:hidden
+      - displayName: Deployment apiVersion
+        path: api_version
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:advanced
+        - urn:alm:descriptor:com.tectonic.ui:hidden
       - displayName: Tower Image
         path: tower_image
         x-descriptors:

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

@@ -25,6 +25,15 @@ spec:
               deployment_type:
                 description: Name of the deployment type
                 type: string
+                default: awx
+              kind:
+                description: Kind of the deployment type
+                type: string
+                default: AWX
+              api_version:
+                description: apiVersion of the deployment type
+                type: string
+                default: awx.ansible.com/v1beta1
               development_mode:
                 description: If the deployment should be done in development mode
                 type: boolean

roles/installer/defaults/main.yml

@@ -1,5 +1,7 @@
 ---
 deployment_type: awx
+kind: '{{ deployment_type | upper }}'
+api_version: '{{ deployment_type }}.ansible.com/v1beta1'
 
 database_name: "{{ deployment_type }}"
 database_username: "{{ deployment_type }}"

roles/installer/tasks/main.yml

@@ -3,8 +3,8 @@
   k8s:
     state: present
     definition:
-      apiVersion: awx.ansible.com/v1beta1
-      kind: AWX
+      apiVersion: '{{ api_version }}'
+      kind: '{{ kind }}'
       name: '{{ meta.name }}'
       namespace: '{{ meta.namespace }}'
       metadata:
@@ -13,8 +13,8 @@
         labels:
           app.kubernetes.io/name: '{{ meta.name }}'
           app.kubernetes.io/part-of: '{{ meta.name }}'
-          app.kubernetes.io/managed-by: awx-operator
-          app.kubernetes.io/component: awx
+          app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+          app.kubernetes.io/component: '{{ deployment_type }}'
 
 - name: Include secret key configuration tasks
   include_tasks: secret_key_configuration.yml

roles/installer/tasks/resources_configuration.yml

@@ -7,8 +7,8 @@
     namespace: '{{ meta.namespace }}'
     label_selectors:
       - "app.kubernetes.io/name={{ meta.name }}"
-      - "app.kubernetes.io/managed-by=awx-operator"
-      - "app.kubernetes.io/component=awx"
+      - "app.kubernetes.io/managed-by={{ deployment_type }}-operator"
+      - "app.kubernetes.io/component={{ deployment_type }}"
     field_selectors:
       - status.phase=Running
   register: tower_pods
@@ -57,8 +57,8 @@
         namespace: '{{ meta.namespace }}'
         label_selectors:
           - "app.kubernetes.io/name={{ meta.name }}"
-          - "app.kubernetes.io/managed-by=awx-operator"
-          - "app.kubernetes.io/component=awx"
+          - "app.kubernetes.io/managed-by={{ deployment_type }}-operator"
+          - "app.kubernetes.io/component={{ deployment_type }}"
         field_selectors:
           - status.phase=Running
       register: _new_pod

roles/installer/tasks/update_status.yml

@@ -1,9 +1,4 @@
 ---
-- name: Set apiVersion and kind variables
-  set_fact:
-    api_version: '{{ hostvars["localhost"]["inventory_file"].split("/")[4:6] | join("/")  }}'
-    kind: '{{ hostvars["localhost"]["inventory_file"].split("/")[6]  }}'
-
 - name: Update admin password status
   operator_sdk.util.k8s_status:
     api_version: '{{ api_version }}'

roles/installer/templates/tower_admin_password_secret.yaml.j2

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 stringData:
   password: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}'

roles/installer/templates/tower_app_credentials.yaml.j2

@@ -8,8 +8,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 data:
   credentials.py: "{{ lookup('template', 'credentials.py.j2') | b64encode }}"
   ldap.py: "{{ lookup('template', 'ldap.py.j2') | b64encode }}"

roles/installer/templates/tower_broadcast_websocket_secret.yaml.j2

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 stringData:
   secret: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}'

roles/installer/templates/tower_config.yaml.j2

@@ -8,8 +8,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 data:
   environment: |
     AWX_SKIP_MIGRATIONS=true

roles/installer/templates/tower_deployment.yaml.j2

@@ -9,23 +9,23 @@ metadata:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/version: '{{ tower_image_version }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 spec:
   replicas: {{ tower_replicas }}
   selector:
     matchLabels:
       app.kubernetes.io/name: '{{ meta.name }}'
-      app.kubernetes.io/managed-by: awx-operator
-      app.kubernetes.io/component: awx
+      app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+      app.kubernetes.io/component: '{{ deployment_type }}'
   template:
     metadata:
       labels:
         app.kubernetes.io/name: '{{ meta.name }}'
         app.kubernetes.io/version: '{{ tower_image_version }}'
         app.kubernetes.io/part-of: '{{ meta.name }}'
-        app.kubernetes.io/managed-by: awx-operator
-        app.kubernetes.io/component: awx
+        app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+        app.kubernetes.io/component: '{{ deployment_type }}'
     spec:
       serviceAccountName: '{{ meta.name }}'
 {% if tower_image_pull_secret %}

roles/installer/templates/tower_ingress.yaml.j2

@@ -8,8 +8,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 {% if tower_ingress_annotations %}
   annotations:
     {{ tower_ingress_annotations | indent(width=4) }}
@@ -41,8 +41,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 spec:
 {% if tower_route_host != '' %}
   host: {{ tower_route_host }}

roles/installer/templates/tower_persistent.yaml.j2

@@ -7,8 +7,8 @@ metadata:
   labels:
    app.kubernetes.io/name: '{{ meta.name }}'
    app.kubernetes.io/part-of: '{{ meta.name }}'
-   app.kubernetes.io/managed-by: awx-operator
-   app.kubernetes.io/component: awx
+   app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+   app.kubernetes.io/component: '{{ deployment_type }}'
 spec:
   accessModes:
     - {{ tower_projects_storage_access_mode }}

roles/installer/templates/tower_postgres.yaml.j2

@@ -8,13 +8,13 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}-postgres'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
     app.kubernetes.io/component: database
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: '{{ meta.name }}-postgres'
-      app.kubernetes.io/managed-by: awx-operator
+      app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
       app.kubernetes.io/component: database
   serviceName: '{{ meta.name }}'
   replicas: 1
@@ -25,7 +25,7 @@ spec:
       labels:
         app.kubernetes.io/name: '{{ meta.name }}-postgres'
         app.kubernetes.io/part-of: '{{ meta.name }}'
-        app.kubernetes.io/managed-by: awx-operator
+        app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
         app.kubernetes.io/component: database
     spec:
       containers:
@@ -90,7 +90,7 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}-postgres'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
     app.kubernetes.io/component: database
 spec:
   ports:
@@ -98,5 +98,5 @@ spec:
   clusterIP: None
   selector:
     app.kubernetes.io/name: '{{ meta.name }}-postgres'
-    app.kubernetes.io/managed-by: awx-operator
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
     app.kubernetes.io/component: database

roles/installer/templates/tower_postgres_secret.yaml.j2

@@ -8,8 +8,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 stringData:
   password: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}'
   username: '{{ database_username }}'

roles/installer/templates/tower_secret_key.yaml.j2

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 stringData:
   secret_key: '{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}'

roles/installer/templates/tower_service.yaml.j2

@@ -7,8 +7,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 {% if tower_ingress_type | lower == 'loadbalancer' and tower_loadbalancer_annotations %}
   annotations:
     {{ tower_loadbalancer_annotations | indent(width=4) }}
@@ -40,8 +40,8 @@ spec:
 {% endif %}
   selector:
     app.kubernetes.io/name: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 {% if tower_ingress_type | lower == "loadbalancer" %}
   type: LoadBalancer
 {% elif tower_ingress_type != "none" %}

roles/installer/templates/tower_service_account.yaml.j2

@@ -7,8 +7,8 @@ metadata:
   labels:
     app.kubernetes.io/name: '{{ meta.name }}'
     app.kubernetes.io/part-of: '{{ meta.name }}'
-    app.kubernetes.io/managed-by: awx-operator
-    app.kubernetes.io/component: awx
+    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
+    app.kubernetes.io/component: '{{ deployment_type }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role