[incubator-sdap-nexus] branch bug_fixes updated: only deploy config operator if it is enabled

[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 ab0ad3c  only deploy config operator if it is enabled
ab0ad3c is described below

commit ab0ad3c9633bda451609512dfa4e797dc90fdf29
Author: Eamon Ford <ea...@gmail.com>
AuthorDate: Mon Aug 10 10:13:37 2020 -0700

    only deploy config operator if it is enabled
---
 helm/templates/_helpers.tpl        | 2 +-
 helm/templates/config-operator.yml | 3 ++-
 helm/values.yaml                   | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index a016b2f..5944f33 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -4,7 +4,7 @@
 Name of the generated configmap containing the contents of the collections config file.
 */}}
 {{- define "nexus.collectionsConfig.configmapName" -}}
-collections-config
+{{ .Values.ingestion.collections.configMap | default "collections-config" }}
 {{- end -}}
 
 {{/*
diff --git a/helm/templates/config-operator.yml b/helm/templates/config-operator.yml
index 3f56f44..298095e 100644
--- a/helm/templates/config-operator.yml
+++ b/helm/templates/config-operator.yml
@@ -1,4 +1,5 @@
 {{ if .Values.ingestion.enabled }}
+{{ if not .Values.ingestion.collections.configMap }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -21,4 +22,4 @@ spec:
           image: {{ .Values.ingestion.configOperator.image }}
           imagePullPolicy: Always
 {{ end }}
-
+{{ end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 657dfe9..715bb78 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -78,19 +78,17 @@ ingestion:
 
     ## Load the Collections Config file from a local path
     ## This is a future option that is not yet supported!
-    # localDir: /Users/edford/Desktop/collections.yml
+    configMap: collections-config
 
     ## Load the Collections Config file from a git repository
     ## Until localDir is supported, this configuration is mandatory
     git:
 
-
       ## This should be an https repository url of the form https://github.com/username/repo.git
       url:
 
       branch: master
 
-      ## token is not yet supported!
       # token: someToken
 
   ## Where to store ingestion history