Allow excluding IoT CRDs during Ansible installation (fixes EnMassePr…

…oject#5046)
ctron · Jul 23, 2020 · b8c3bbd · b8c3bbd
1 parent 3dfac5c
commit b8c3bbd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/ansible/roles/crds/tasks/main.yml b/ansible/roles/crds/tasks/main.yml
@@ -1,3 +1,10 @@
 ---
 - name: Install the CRDs
   shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/crds
+  shell: |
+    for i in $(find "{{ playbook_dir }}/install/crds" ! -name "010-iot*"); do oc apply -n {{ namespace }} -f "$i"; done
+  with: not enable_iot
+
+- name: Install the IoT CRDs
+  shell: oc apply -n {{ namespace }} -f {{ playbook_dir }}/install/crds
+  with: enable_iot
diff --git a/ansible/roles/enmasse_operator/tasks/main.yml b/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
diff --git a/ansible/roles/iot/tasks/main.yml b/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

diff --git a/cmd/controller-manager/main.go b/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") {