Merge pull request #50 from mbaldessari/fix-anotherissue

We must not create the namespace nor operator group when gitOpsSubNamespace is empty or null

Author: mbaldessari

Chart.yaml

@@ -3,4 +3,4 @@ description: A Helm chart to configure Advanced Cluster Manager for OpenShift.
 keywords:
 - pattern
 name: acm
-version: 0.1.21
+version: 0.1.22

README.md

@@ -1,6 +1,6 @@
 # acm
 
-![Version: 0.1.21](https://img.shields.io/badge/Version-0.1.21-informational?style=flat-square)
+![Version: 0.1.22](https://img.shields.io/badge/Version-0.1.22-informational?style=flat-square)
 
 A Helm chart to configure Advanced Cluster Manager for OpenShift.
 

templates/policies/ocp-gitops-policy.yaml

@@ -53,7 +53,7 @@ spec:
                   namespace: openshift-gitops
                   labels:
                     config.openshift.io/inject-trusted-cabundle: 'true'
-            {{- if ne $.Values.global.gitOpsSubNamespace "openshift-operators" }}
+            {{- if and $.Values.global.gitOpsSubNamespace (ne $.Values.global.gitOpsSubNamespace "openshift-operators") }}
             - complianceType: mustonlyhave
               objectDefinition:
                 apiVersion: v1

tests/gitops_sub_namespace_test.yaml

@@ -137,6 +137,44 @@ tests:
           path: spec.policy-templates[0].objectDefinition.spec.object-templates
           count: 2 # Just subscription and configmap
 
+  - it: should not create operatorgroup nor namespace object-template when gitOpsSubNamespace is set to null
+    set:
+      global:
+        gitOpsSubNamespace: null
+      clusterGroup:
+        managedClusterGroups:
+          region-one:
+            name: region-one
+            acmlabels:
+              - name: clusterGroup
+                value: region-one
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: region-one-gitops-policy
+        lengthEqual:
+          path: spec.policy-templates[0].objectDefinition.spec.object-templates
+          count: 2 # Just subscription and configmap
+
+  - it: should not create operatorgroup nor namespace object-template when gitOpsSubNamespace is set to empty
+    set:
+      global:
+        gitOpsSubNamespace: ''
+      clusterGroup:
+        managedClusterGroups:
+          region-one:
+            name: region-one
+            acmlabels:
+              - name: clusterGroup
+                value: region-one
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: region-one-gitops-policy
+        lengthEqual:
+          path: spec.policy-templates[0].objectDefinition.spec.object-templates
+          count: 2 # Just subscription and configmap
+
   - it: should use gitOpsSubNamespace as subscription namespace when set
     set:
       global: