You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by ea...@apache.org on 2020/07/06 23:14:14 UTC
[incubator-sdap-nexus] branch helm-ingester updated: helm chart
updates
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 35d81dc helm chart updates
35d81dc is described below
commit 35d81dc7fb5a4a4a95e3414b1aacf079049700a7
Author: Eamon Ford <ea...@jpl.nasa.gov>
AuthorDate: Mon Jul 6 18:14:01 2020 -0500
helm chart updates
---
helm/templates/_helpers.tpl | 18 ++++++++++++++++++
helm/templates/collection-manager.yml | 30 ++++--------------------------
helm/templates/config-operator.yml | 2 +-
helm/templates/granule-ingester.yml | 20 ++++++--------------
helm/templates/history-pvc.yml | 12 ++++++++++++
helm/values.yaml | 17 +++++++++++++++--
6 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 371c877..84bd952 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -21,3 +21,21 @@ Path at which to mount the history directory in the Collection Manager, if not u
/var/lib/sdap/history
{{- end -}}
+
+{{- define "nexus.ingestion.dataVolume" -}}
+- 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 }}
+{{- end -}}
+
+{{- define "nexus.ingestion.dataVolumeMount" -}}
+- name: data-volume
+ mountPath: {{ .Values.ingestion.granules.mountPath }}
+{{- end -}}
+
diff --git a/helm/templates/collection-manager.yml b/helm/templates/collection-manager.yml
index 232108c..01f3c63 100644
--- a/helm/templates/collection-manager.yml
+++ b/helm/templates/collection-manager.yml
@@ -18,7 +18,8 @@ spec:
app: collection-manager
spec:
containers:
- - image: nexusjpl/collection-manager:0.0.1
+ - image: {{ .Values.ingestion.collectionManager.image }}
+ imagePullPolicy: Always
name: collection-manager
env:
- name: RABBITMQ_USERNAME
@@ -37,15 +38,15 @@ spec:
value: {{ include "nexus.history.mountPath" . }}
{{- end }}
volumeMounts:
+{{ include "nexus.ingestion.dataVolumeMount" . | indent 12 }}
{{- 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:
+{{ include "nexus.ingestion.dataVolume" . | indent 8 }}
- name: collections-config-volume
configMap:
name: {{ include "nexus.collectionsConfig.configmapName" . }}
@@ -54,29 +55,6 @@ spec:
persistentVolumeClaim:
claimName: history-volume-claim
{{- end }}
- - 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 }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: history-volume-claim
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 1Gi
- storageClassName: {{ .Values.storageClass }}
-
diff --git a/helm/templates/config-operator.yml b/helm/templates/config-operator.yml
index b824de1..f7260ad 100644
--- a/helm/templates/config-operator.yml
+++ b/helm/templates/config-operator.yml
@@ -18,7 +18,7 @@ spec:
serviceAccountName: config-operator
containers:
- name: sdap-config-operator
- image: nexusjpl/config-operator:latest
+ image: {{ .Values.ingestion.configOperator.image }}
imagePullPolicy: Always
{{ end }}
diff --git a/helm/templates/granule-ingester.yml b/helm/templates/granule-ingester.yml
index 5e81f91..4756f22 100644
--- a/helm/templates/granule-ingester.yml
+++ b/helm/templates/granule-ingester.yml
@@ -6,7 +6,7 @@ metadata:
app: granule-ingester
name: granule-ingester
spec:
- replicas: 1
+ replicas: 5
selector:
matchLabels:
app: granule-ingester
@@ -16,7 +16,7 @@ spec:
app: granule-ingester
spec:
containers:
- - image: nexusjpl/granule-ingester:latest
+ - image: {{ .Values.ingestion.granuleIngester.image }}
name: granule-ingester
env:
- name: RABBITMQ_USERNAME
@@ -30,17 +30,9 @@ spec:
- name: SOLR_HOST_AND_PORT
value: http://sdap-solr:8983
volumeMounts:
- - name: data-volume
- mountPath: /data
+{{ include "nexus.ingestion.dataVolumeMount" . | indent 12 }}
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 }}
+{{ include "nexus.ingestion.dataVolume" . | indent 8 }}
restartPolicy: Always
-{{- end }}
\ No newline at end of file
+{{- end }}
+
diff --git a/helm/templates/history-pvc.yml b/helm/templates/history-pvc.yml
new file mode 100644
index 0000000..3ecabe9
--- /dev/null
+++ b/helm/templates/history-pvc.yml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: history-volume-claim
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 1Gi
+ storageClassName: {{ .Values.storageClass }}
+
diff --git a/helm/values.yaml b/helm/values.yaml
index 3411e1b..4562cc3 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -22,8 +22,20 @@ webapp:
ingestion:
enabled: true
+
+ granuleIngester:
+ replicas: 2
+ image: nexusjpl/granule-ingester:latest
+
+ collectionManager:
+ image: nexusjpl/collection-manager:0.0.2
+
+ configOperator:
+ image: nexusjpl/config-operator:latest
+
granules:
# nfsServer: test-nfs-server.com
+ mountPath: /data
path: /Users/edford/Desktop/ingestion_test/data
collections:
# localDir: /Users/edford/Desktop/collections.yml
@@ -50,13 +62,13 @@ solr:
heap: 4g
requests:
memory: 5Gi
- cpu: 1
+ cpu: 1
limits:
memory: 5Gi
cpu: 1
zookeeper:
- replicas: 3
+ replicas: 3
memory: 1Gi
cpu: 0.5
storage: 8Gi
@@ -81,6 +93,7 @@ nginx-ingress:
rabbitmq:
fullnameOverride: rabbitmq
+ replicaCount: 2
auth:
username: guest
password: guest