[incubator-sdap-nexus] branch master updated: make chart work with pre-existing data-volume (pvc) (#127)

[tloubrieu]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new fad04a9  make chart work with pre-existing data-volume (pvc) (#127)
fad04a9 is described below

commit fad04a9ce50877c075b6fbf51497ab46f9194d85
Author: thomas loubrieu <60993872+tloubrieu-...@users.noreply.github.com>
AuthorDate: Fri May 28 10:52:07 2021 -0700

    make chart work with pre-existing data-volume (pvc) (#127)
    
    Co-authored-by: thomas loubrieu <thomas.loubr...@jpl.nasa.gov>
---
 helm/templates/_helpers.tpl | 4 +++-
 helm/values.yaml            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 56dcb4a..30a5623 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -32,9 +32,11 @@ The data volume which is used in both the Collection Manager 
and the Granule Ing
     server: {{ .Values.ingestion.granules.nfsServer }}
     path: {{ .Values.ingestion.granules.path }}
   {{- else }}
+  {{- if .Values.ingestion.granules.path -}}
   hostPath:
     path: {{ .Values.ingestion.granules.path }}
-{{- end }}
+  {{- end -}}
+  {{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/helm/values.yaml b/helm/values.yaml
index a2cba8c..70c8bba 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -29,7 +29,7 @@ ingestion:
 
   granuleIngester:
     replicas: 2
-    image: nexusjpl/granule-ingester:0.1.5
+    image: nexusjpl/granule-ingester:0.1.6
 
     ## cpu refers to both request and limit
     cpu: 1
@@ -38,7 +38,7 @@ ingestion:
     memory: 1Gi
 
   collectionManager:
-    image: nexusjpl/collection-manager:0.1.5
+    image: nexusjpl/collection-manager:0.1.6
 
     ## cpu refers to both request and limit
     cpu: 0.5