This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch helm-ingester
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/helm-ingester by this push:
new 17022f1 add granule ingester to helm chart
17022f1 is described below
commit 17022f1a9b1e309fa5300b4c31414273463a53d1
Author: Eamon Ford <[email protected]>
AuthorDate: Fri Jul 3 14:10:27 2020 -0500
add granule ingester to helm chart
---
helm/templates/_helpers.tpl | 4 +--
helm/templates/collection-manager.yml | 4 +--
helm/templates/granule-ingester.yml | 46 +++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index f3f70bc..371c877 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -11,13 +11,13 @@ collections-config
Path at which to mount the collections config file in the Collection Manager.
*/}}
{{- define "nexus.collectionsConfig.mountPath" -}}
-/sdap/history
+/var/lib/sdap/collections
{{- end -}}
{{/*
Path at which to mount the history directory in the Collection Manager, if not
using Solr for history.
*/}}
{{- define "nexus.history.mountPath" -}}
-/sdap/history
+/var/lib/sdap/history
{{- end -}}
diff --git a/helm/templates/collection-manager.yml
b/helm/templates/collection-manager.yml
index b99366c..7dbefdc 100644
--- a/helm/templates/collection-manager.yml
+++ b/helm/templates/collection-manager.yml
@@ -37,14 +37,14 @@ spec:
value: {{ include "nexus.history.mountPath" . }}
{{- end }}
volumeMounts:
- - name: collections-config-volume
- mountPath: {{ include "nexus.collectionsConfig.mountPath" . }}
{{- if not $history.url }}
- name: history-volume
mountPath: {{ include "nexus.history.mountPath" . }}
{{- end }}
- name: data-volume
mountPath: /data
+ - name: collections-config-volume
+ mountPath: {{ include "nexus.collectionsConfig.mountPath" . }}
volumes:
- name: collections-config-volume
configMap:
diff --git a/helm/templates/granule-ingester.yml
b/helm/templates/granule-ingester.yml
new file mode 100644
index 0000000..5e81f91
--- /dev/null
+++ b/helm/templates/granule-ingester.yml
@@ -0,0 +1,46 @@
+{{- if .Values.ingestion.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ app: granule-ingester
+ name: granule-ingester
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: granule-ingester
+ template:
+ metadata:
+ labels:
+ app: granule-ingester
+ spec:
+ containers:
+ - image: nexusjpl/granule-ingester:latest
+ name: granule-ingester
+ env:
+ - name: RABBITMQ_USERNAME
+ value: {{ .Values.rabbitmq.auth.username }}
+ - name: RABBITMQ_PASSWORD
+ value: {{ .Values.rabbitmq.auth.password }}
+ - name: RABBITMQ_HOST
+ value: {{ .Values.rabbitmq.fullnameOverride }}
+ - name: CASSANDRA_CONTACT_POINTS
+ value: sdap-cassandra
+ - name: SOLR_HOST_AND_PORT
+ value: http://sdap-solr:8983
+ volumeMounts:
+ - name: data-volume
+ mountPath: /data
+ volumes:
+ - name: data-volume
+ {{- if .Values.ingestion.granules.nfsServer }}
+ nfs:
+ server: {{ .Values.ingestion.granules.nfsServer }}
+ path: {{ .Values.ingestion.granules.path }}
+ {{- else }}
+ hostPath:
+ path: {{ .Values.ingestion.granules.path }}
+ {{- end }}
+ restartPolicy: Always
+{{- end }}
\ No newline at end of file
