fix bug with gitrepository inclusion logic

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

chart/templates/certmanager/gitrepository.yaml

-{{- 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:

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

chart/templates/gatekeeper/gitrepository.yaml

-{{- 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:

chart/templates/istio/gitrepository.yaml

-{{- 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:

chart/templates/logging/gitrepository.yaml

-{{- 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:

chart/templates/monitoring/gitrepository.yaml

-{{- 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:

chart/templates/twistlock/gitrepository.yaml

-{{- 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: