From 0956d90b105ece7e0cd2bb5e5f8fd7f84e164c54 Mon Sep 17 00:00:00 2001
From: Gareth Healy <garethahealy@gmail.com>
Date: Fri, 1 May 2020 11:24:44 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=B0=20Added=20option=20to=20enable=20o?=
 =?UTF-8?q?perator=20and=20operatorgroup=20for=20argocd-operator=20?=
 =?UTF-8?q?=F0=9F=A5=B0=20(#43)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🥰 * Added option to enable operator and operatorgroup for argocd-operator

* Bumped version
---
 charts/argocd-operator/Chart.yaml                   | 2 +-
 charts/argocd-operator/templates/OperatorGroup.yaml | 4 ++++
 charts/argocd-operator/templates/Subscription.yaml  | 2 ++
 charts/argocd-operator/values.yaml                  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/argocd-operator/Chart.yaml b/charts/argocd-operator/Chart.yaml
index 2a976cb2..1aee1cbc 100644
--- a/charts/argocd-operator/Chart.yaml
+++ b/charts/argocd-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.5.2
 description: A Helm chart for customising the deployment of the ArgoCD Operator ⚓️
 name: argocd-operator
-version: 0.0.6
+version: 0.0.7
 home: https://github.com/rht-labs/helm-charts
 maintainers:
 - name: springdo
diff --git a/charts/argocd-operator/templates/OperatorGroup.yaml b/charts/argocd-operator/templates/OperatorGroup.yaml
index f840f912..959adb4e 100644
--- a/charts/argocd-operator/templates/OperatorGroup.yaml
+++ b/charts/argocd-operator/templates/OperatorGroup.yaml
@@ -1,4 +1,6 @@
 {{- if .Values.enabled }}
+{{- if .Values.operator }}
+{{- if .Values.operator.operatorgroup }}
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
@@ -10,3 +12,5 @@ spec:
   targetNamespaces:
   - {{ .Values.namespace }}
 {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/argocd-operator/templates/Subscription.yaml b/charts/argocd-operator/templates/Subscription.yaml
index 796185ba..a44d5f22 100644
--- a/charts/argocd-operator/templates/Subscription.yaml
+++ b/charts/argocd-operator/templates/Subscription.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.enabled }}
+{{- if .Values.operator }}
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -13,3 +14,4 @@ spec:
   sourceNamespace: openshift-marketplace
   startingCSV: {{ .Values.operator.version | quote }}
 {{- end }}
+{{- end }}
diff --git a/charts/argocd-operator/values.yaml b/charts/argocd-operator/values.yaml
index 0abacedc..b3d9dcc5 100644
--- a/charts/argocd-operator/values.yaml
+++ b/charts/argocd-operator/values.yaml
@@ -12,6 +12,7 @@ operator:
   version: argocd-operator.v0.0.8
   channel: alpha
   name: argocd-operator
+  operatorgroup: true
 
 # https://argocd-operator.readthedocs.io/en/latest/reference/argocd/
 metrics: