[incubator-sdap-nexus] branch bug_fixes updated: Only create gitcfg if if configMap not set

[ea...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eamonford pushed a commit to branch bug_fixes
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git


The following commit(s) were added to refs/heads/bug_fixes by this push:
     new 793fa5d  Only create gitcfg if if configMap not set
793fa5d is described below

commit 793fa5d889fafb080ab5377f240b66d24f65dd84
Author: Eamon Ford <ea...@gmail.com>
AuthorDate: Thu Sep 17 10:44:07 2020 -0700

    Only create gitcfg if if configMap not set
---
 helm/templates/collections-config-gitcfg.yml | 4 ++++
 helm/values.yaml                             | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/helm/templates/collections-config-gitcfg.yml b/helm/templates/collections-config-gitcfg.yml
index e4b7294..ea78f9a 100644
--- a/helm/templates/collections-config-gitcfg.yml
+++ b/helm/templates/collections-config-gitcfg.yml
@@ -1,3 +1,5 @@
+{{ if .Values.ingestion.enabled }}
+{{ if not .Values.ingestion.collections.configMap }}
 apiVersion: sdap.apache.org/v1
 kind: GitBasedConfig
 metadata:
@@ -11,3 +13,5 @@ spec:
   local-dir: {{ .Values.ingestion.collections.localDir }}
   {{ end }}
   config-map: {{ include "nexus.collectionsConfig.configmapName" . }}
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/helm/values.yaml b/helm/values.yaml
index 5405c0f..4001aaf 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -77,8 +77,6 @@ ingestion:
   collections:
     createCrd: true
 
-    ## Load the Collections Config file from a local path
-    ## This is a future option that is not yet supported!
     #configMap: collections-config
 
     ## Load the Collections Config file from a git repository