From 113a9076b64ac070866050c31e692c2da62b3cdd Mon Sep 17 00:00:00 2001
From: Lester Claudio <claudiol@redhat.com>
Date: Wed, 29 May 2024 14:06:55 -0600
Subject: [PATCH] bug: Invalid OperatorGroup generated when ommitting
 targetNamespaces

Problem Statement:
When setting a namespace like this:
    - openshift-distributed-tracing:
        operatorGroup: true
        targetNamespaces: []

The chart generates the following yaml:
```yaml
apiVersion: operators.coreos.com/v1
kind: OperatorGroup
metadata:
  name: openshift-distributed-tracing-operator-group
  namespace: openshift-distributed-tracing
spec:
  targetNamespaces:
```

Which k8s rejects the targetNamespaces key as invalid when it attempts to apply it and removes it since it doesn't have a value, which just so happens to have the desired result of not setting the targetNamespaces (or a selector) to enable it for All Namespaces.
---
 clustergroup/templates/_helpers.tpl               | 12 +++++++++---
 clustergroup/templates/core/operatorgroup.yaml    | 10 +++++++---
 clustergroup/templates/plumbing/applications.yaml |  2 +-
 tests/clustergroup-normal.expected.yaml           |  2 --
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/clustergroup/templates/_helpers.tpl b/clustergroup/templates/_helpers.tpl
index 5001a06e..c6d14d08 100644
--- a/clustergroup/templates/_helpers.tpl
+++ b/clustergroup/templates/_helpers.tpl
@@ -202,13 +202,19 @@ kind: OperatorGroup
 metadata:
   name: {{ $k }}-operator-group
   namespace: {{ $k }}
+      {{- if (hasKey $v "targetNamespaces") }}
+        {{- if $v.targetNamespaces }}
+          {{- if (len $v.targetNamespaces) }}
 spec:
   targetNamespaces:
-      {{- if (hasKey $v "targetNamespaces") }}
-        {{- range $v.targetNamespaces }}{{- /* We loop through the list of tergetnamespaces */}}
+            {{- range $v.targetNamespaces }}{{- /* We loop through the list of tergetnamespaces */}}
   - {{ . }}
-        {{- end }}{{- /* End range targetNamespaces */}}
+            {{- end }}{{- /* End range targetNamespaces */}}
+          {{- end }}{{- /* End if (len $v.targetNamespaces) */}}
+        {{- end }}{{- /* End $v.targetNamespaces */}}
       {{- else }}
+spec:
+  targetNamespaces:
   - {{ $k }}
       {{- end }}{{- /* End of if hasKey $v "targetNamespaces" */}}
     {{- end }}{{- /* End if $v.operatorGroup */}}
diff --git a/clustergroup/templates/core/operatorgroup.yaml b/clustergroup/templates/core/operatorgroup.yaml
index 4d8c3014..6adfef47 100644
--- a/clustergroup/templates/core/operatorgroup.yaml
+++ b/clustergroup/templates/core/operatorgroup.yaml
@@ -21,15 +21,19 @@ kind: OperatorGroup
 metadata:
   name: {{ $k }}-operator-group
   namespace: {{ $k }}
+  {{- if (hasKey $v "targetNamespaces") }}
+    {{- if $v.targetNamespaces }}
 spec:
   targetNamespaces:
-    {{- if (hasKey $v "targetNamespaces") }}
       {{- range $v.targetNamespaces }}{{- /* We loop through the list of tergetnamespaces */}}
   - {{ . }}
       {{- end }}{{- /* End range targetNamespaces */}}
-    {{- else }}
+    {{- end }}{{- /* End if $v.targetNamespaces */}}
+  {{- else }}
+spec:
+  targetNamespaces:
   - {{ $k }}
-    {{- end }}{{- /* End of if operatorGroup */}}
+  {{- end }}{{- /* End of if (hasKey $v "targetNamespaces") */}}
   {{- end }}{{- /* range $k, $v := $ns */}}
   {{- end }}{{- /* End of if operatorGroup */}}
   {{- else if kindIs "string" $ns }}
diff --git a/clustergroup/templates/plumbing/applications.yaml b/clustergroup/templates/plumbing/applications.yaml
index 870babe3..0b9f4eda 100644
--- a/clustergroup/templates/plumbing/applications.yaml
+++ b/clustergroup/templates/plumbing/applications.yaml
@@ -78,7 +78,7 @@ spec:
             - name: global.namespace
               value: {{ $.Values.global.namespace }}
             - name: clusterGroup.name
-              value: {{ .Values.clusterGroup.name }}
+              value: {{ $.Values.clusterGroup.name }}
         {{- range .extraHubClusterDomainFields }}
             - name: {{ . }}
               value: {{ $.Values.global.hubClusterDomain }}
diff --git a/tests/clustergroup-normal.expected.yaml b/tests/clustergroup-normal.expected.yaml
index 41eb68b8..c594b65e 100644
--- a/tests/clustergroup-normal.expected.yaml
+++ b/tests/clustergroup-normal.expected.yaml
@@ -1197,8 +1197,6 @@ kind: OperatorGroup
 metadata:
   name: exclude-targetns-operator-group
   namespace: exclude-targetns
-spec:
-  targetNamespaces:
 ---
 # Source: clustergroup/templates/core/operatorgroup.yaml
 ---