From 1ce4af7545780259569e8b7c004959f9cd524b20 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@joshwolf.dev>
Date: Tue, 3 Nov 2020 23:02:12 -0700
Subject: [PATCH] fix bug with gitrepository inclusion logic

---
 chart/templates/certmanager/cert-manager-helmrelease.yaml | 2 +-
 chart/templates/certmanager/gitrepository.yaml            | 2 +-
 chart/templates/gatekeeper/gatekeeper-helmrelease.yaml    | 3 +++
 chart/templates/gatekeeper/gitrepository.yaml             | 2 +-
 chart/templates/istio/gitrepository.yaml                  | 2 +-
 chart/templates/logging/gitrepository.yaml                | 2 +-
 chart/templates/monitoring/gitrepository.yaml             | 2 +-
 chart/templates/twistlock/gitrepository.yaml              | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chart/templates/certmanager/cert-manager-helmrelease.yaml b/chart/templates/certmanager/cert-manager-helmrelease.yaml
index 23c811f3df..9fe04b1560 100644
--- a/chart/templates/certmanager/cert-manager-helmrelease.yaml
+++ b/chart/templates/certmanager/cert-manager-helmrelease.yaml
@@ -2,7 +2,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: {{ .Release.Name }}-cert-manager
+  name: {{ .Release.Name }}-certmanager
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: cert-manager
diff --git a/chart/templates/certmanager/gitrepository.yaml b/chart/templates/certmanager/gitrepository.yaml
index 962958e03c..dbac7ee7c8 100644
--- a/chart/templates/certmanager/gitrepository.yaml
+++ b/chart/templates/certmanager/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.certmanager.enabled }}
+{{- if and (not .Values.global.offline) .Values.certmanager.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
index b74c9f1b14..673ea16081 100644
--- a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
+++ b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
@@ -43,7 +43,10 @@ spec:
     - name: env-values
       kind: Secret
       optional: true
+
+  {{- if .Values.certmanager.enabled }}
   dependsOn:
   - name: {{ .Release.Name }}-certmanager
     namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/gatekeeper/gitrepository.yaml b/chart/templates/gatekeeper/gitrepository.yaml
index 1076220ca7..59c1442b7d 100644
--- a/chart/templates/gatekeeper/gitrepository.yaml
+++ b/chart/templates/gatekeeper/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.gatekeeper.enabled }}
+{{- if and (not .Values.global.offline) .Values.gatekeeper.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/istio/gitrepository.yaml b/chart/templates/istio/gitrepository.yaml
index 47261a7874..f218fbb37b 100644
--- a/chart/templates/istio/gitrepository.yaml
+++ b/chart/templates/istio/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.istio.enabled }}
+{{- if and (not .Values.global.offline) .Values.istio.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/logging/gitrepository.yaml b/chart/templates/logging/gitrepository.yaml
index 3e65d649e0..416623db92 100644
--- a/chart/templates/logging/gitrepository.yaml
+++ b/chart/templates/logging/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.logging.enabled }}
+{{- if and (not .Values.global.offline) .Values.logging.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/monitoring/gitrepository.yaml b/chart/templates/monitoring/gitrepository.yaml
index 828aa63fa8..ae9e2b4c22 100644
--- a/chart/templates/monitoring/gitrepository.yaml
+++ b/chart/templates/monitoring/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.monitoring.enabled }}
+{{- if and (not .Values.global.offline) .Values.monitoring.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/twistlock/gitrepository.yaml b/chart/templates/twistlock/gitrepository.yaml
index 66b4be27dc..5e914d2176 100644
--- a/chart/templates/twistlock/gitrepository.yaml
+++ b/chart/templates/twistlock/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.twistlock.enabled }}
+{{- if and (not .Values.global.offline) .Values.twistlock.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
-- 
GitLab