Allow excluding IoT CRDs during Ansible installation (fixes #5046)

ansible/inventory/with-standard-authservice.txt

@@ -4,6 +4,7 @@ localhost ansible_connection=local
 [enmasse:vars]
 namespace=enmasse-infra
 enable_rbac=True
+enable_iot=True
 service_catalog=False
 keycloak_admin_password=admin
 authentication_services=["standard"]

ansible/roles/cluster_admin/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
 monitoring_operator: False
 monitoring: False
-enable_iot: False
+enable_iot: True

ansible/roles/crds/tasks/main.yml

@@ -1,3 +1,9 @@
 ---
-- name: Install the CRDs
+- name: Install the core CRDs (excluding IoT)
+  shell: |
+    for i in $(find "{{ playbook_dir }}/install/crds" -type f ! -name "010-iot*"); do oc apply -f "$i"; done
+  when: not enable_iot
+
+- name: Install the CRDs (including IoT)
   shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/crds
+  when: enable_iot

ansible/roles/defaults/defaults/main.yml

@@ -2,7 +2,7 @@
 enmasse_serviceaccount: enmasse-admin
 enmasse_environment: development
 enable_rbac: true
-enable_iot: false
+enable_iot: true
 keycloak_admin_user: admin
 service_catalog: false
 standard_authservice_resources: standard_authservice_keycloak

ansible/roles/enmasse_operator/tasks/main.yml

@@ -1,3 +1,6 @@
 ---
 - name: Apply the EnMasse Operator
   shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/enmasse-operator
+- name: Disable IoT modules
+  shell: oc set env deployment/enmasse-operator CONTROLLER_ENABLE_IOT_CONFIG=false CONTROLLER_ENABLE_IOT_PROJECT=false
+  when: not enable_iot

ansible/roles/iot/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Apply the IoT CRD
+- name: Apply the IoT API Roles
   shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/iot/api
 - name: Apply the IoT Common
   shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/iot/common

cmd/controller-manager/main.go

@@ -162,16 +162,21 @@ func main() {
 			Version: "v1beta1",
 			Kind:    "AddressList",
 		},
-		schema.GroupVersionKind{
-			Group:   "iot.enmasse.io",
-			Version: "v1alpha1",
-			Kind:    "IoTProject",
-		},
-		schema.GroupVersionKind{
-			Group:   "iot.enmasse.io",
-			Version: "v1alpha1",
-			Kind:    "IoTProjectList",
-		},
+	}
+
+	if util.IsModuleEnabled("IOT_PROJECT") {
+		globalGvks = append(globalGvks,
+			schema.GroupVersionKind{
+				Group:   "iot.enmasse.io",
+				Version: "v1alpha1",
+				Kind:    "IoTProject",
+			},
+			schema.GroupVersionKind{
+				Group:   "iot.enmasse.io",
+				Version: "v1alpha1",
+				Kind:    "IoTProjectList",
+			},
+		)
 	}
 
 	if util.IsModuleEnabled("MESSAGING_INFRASTRUCTURE") {