This is an automated email from the ASF dual-hosted git repository.
jjacob 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 e1852f7 SDAP-222: Add support for nodeSelectors and tolerations in
the Helm chart (#92)
e1852f7 is described below
commit e1852f7ddf28f9b8302d46196c62ba2d595221be
Author: Eamon Ford <[email protected]>
AuthorDate: Mon Mar 2 11:11:21 2020 -0800
SDAP-222: Add support for nodeSelectors and tolerations in the Helm chart
(#92)
---
helm/Chart.yaml | 2 +-
helm/templates/cassandra.yml | 8 ++++++++
helm/templates/solr.yml | 8 ++++++++
helm/templates/webapp.yaml | 8 ++------
helm/templates/zookeeper.yml | 8 ++++++++
5 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 51c17aa..730c071 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "0.1.3"
description: Science Data Analytics Platform
name: nexus
-version: 0.1.7
+version: 0.1.8
diff --git a/helm/templates/cassandra.yml b/helm/templates/cassandra.yml
index 0fb27a4..6023e55 100644
--- a/helm/templates/cassandra.yml
+++ b/helm/templates/cassandra.yml
@@ -29,6 +29,14 @@ spec:
app: sdap-cassandra
spec:
terminationGracePeriodSeconds: 120
+ {{ if .Values.cassandra.tolerations }}
+ tolerations:
+{{ .Values.cassandra.tolerations | toYaml | indent 6 }}
+ {{ end }}
+ {{ if .Values.cassandra.nodeSelector }}
+ nodeSelector:
+{{ .Values.cassandra.nodeSelector | toYaml | indent 8 }}
+ {{ end }}
affinity:
podAntiAffinity:
# Prefer spreading over all hosts
diff --git a/helm/templates/solr.yml b/helm/templates/solr.yml
index c1ccc46..c8d0f9b 100644
--- a/helm/templates/solr.yml
+++ b/helm/templates/solr.yml
@@ -28,6 +28,14 @@ spec:
app: sdap-solr # has to match .spec.selector.matchLabels
spec:
terminationGracePeriodSeconds: 10
+ {{ if .Values.solr.tolerations }}
+ tolerations:
+{{ .Values.solr.tolerations | toYaml | indent 6 }}
+ {{ end }}
+ {{ if .Values.solr.nodeSelector }}
+ nodeSelector:
+{{ .Values.solr.nodeSelector | toYaml | indent 8 }}
+ {{ end }}
affinity:
podAntiAffinity:
# Prefer spreading over all hosts
diff --git a/helm/templates/webapp.yaml b/helm/templates/webapp.yaml
index b432894..2c08bf3 100644
--- a/helm/templates/webapp.yaml
+++ b/helm/templates/webapp.yaml
@@ -17,16 +17,12 @@ spec:
onSubmissionFailureRetries: 10
onSubmissionFailureRetryInterval: 10
driver:
- cores: {{ .Values.webapp.distributed.driver.cores }}
- coreLimit: {{ .Values.webapp.distributed.driver.coreLimit }}
- memory: {{ .Values.webapp.distributed.driver.memory }}
+{{ .Values.webapp.distributed.driver | toYaml | indent 4 }}
labels:
version: 2.4.4
serviceAccount: spark-serviceaccount
executor:
- cores: {{ .Values.webapp.distributed.executor.cores }}
- instances: {{ .Values.webapp.distributed.executor.instances }}
- memory: {{ .Values.webapp.distributed.executor.memory }}
+{{ .Values.webapp.distributed.executor| toYaml | indent 4 }}
labels:
version: 2.4.4
diff --git a/helm/templates/zookeeper.yml b/helm/templates/zookeeper.yml
index a195458..1ff735a 100644
--- a/helm/templates/zookeeper.yml
+++ b/helm/templates/zookeeper.yml
@@ -55,6 +55,14 @@ spec:
labels:
app: zk
spec:
+ {{ if .Values.zookeeper.tolerations }}
+ tolerations:
+{{ .Values.zookeeper.tolerations | toYaml | indent 6 }}
+ {{ end }}
+ {{ if .Values.zookeeper.nodeSelector }}
+ nodeSelector:
+{{ .Values.zookeeper.nodeSelector | toYaml | indent 8 }}
+ {{ end }}
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
