diff --git a/stable/spark/Chart.yaml b/stable/spark/Chart.yaml index 17ce97f4cc..4de86a0934 100755 --- a/stable/spark/Chart.yaml +++ b/stable/spark/Chart.yaml @@ -1,5 +1,5 @@ name: spark -version: 0.1.10 +version: 0.1.11 description: Fast and general-purpose cluster computing system. home: http://spark.apache.org icon: http://spark.apache.org/images/spark-logo-trademark.png diff --git a/stable/spark/templates/spark-master-deployment.yaml b/stable/spark/templates/spark-master-deployment.yaml index 3e2a7cf4f9..2e55d3b433 100644 --- a/stable/spark/templates/spark-master-deployment.yaml +++ b/stable/spark/templates/spark-master-deployment.yaml @@ -59,7 +59,7 @@ spec: - name: {{ template "master-fullname" . }} image: "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}" command: ["/bin/sh","-c"] - args: ["echo $(hostname -i) {{ template "master-fullname" . }} >> /etc/hosts; /opt/spark/bin/spark-class org.apache.spark.deploy.master.Master"] + args: ["echo $(hostname -i) {{ template "master-fullname" . }} >> /etc/hosts; {{ .Values.Spark.Path }}/bin/spark-class org.apache.spark.deploy.master.Master"] ports: - containerPort: {{ .Values.Master.ContainerPort }} - containerPort: {{ .Values.WebUi.ContainerPort }} diff --git a/stable/spark/templates/spark-sql-test.yaml b/stable/spark/templates/spark-sql-test.yaml index 62dace8b36..7a9bb7c2b5 100644 --- a/stable/spark/templates/spark-sql-test.yaml +++ b/stable/spark/templates/spark-sql-test.yaml @@ -8,7 +8,7 @@ spec: containers: - name: {{ .Release.Name }}-sql-test image: {{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }} - command: ["/opt/spark/bin/spark-sql", "--master", + command: ["{{ .Values.Spark.Path }}/bin/spark-sql", "--master", "spark://{{ .Release.Name }}-master:{{ .Values.Master.ServicePort }}", "-e", "show databases;"] restartPolicy: Never diff --git a/stable/spark/templates/spark-worker-deployment.yaml b/stable/spark/templates/spark-worker-deployment.yaml index 436d3a5915..04e5db7d0f 100644 --- a/stable/spark/templates/spark-worker-deployment.yaml +++ b/stable/spark/templates/spark-worker-deployment.yaml @@ -25,7 +25,7 @@ spec: containers: - name: {{ template "worker-fullname" . }} image: "{{ .Values.Worker.Image }}:{{ .Values.Worker.ImageTag }}" - command: ["/opt/spark/bin/spark-class", "org.apache.spark.deploy.worker.Worker", "spark://{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}"] + command: ["{{ .Values.Spark.Path }}/bin/spark-class", "org.apache.spark.deploy.worker.Worker", "spark://{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}"] ports: - containerPort: {{ .Values.Worker.ContainerPort }} resources: diff --git a/stable/spark/values.yaml b/stable/spark/values.yaml index a1ea98fba2..4d7476959c 100644 --- a/stable/spark/values.yaml +++ b/stable/spark/values.yaml @@ -3,6 +3,9 @@ # Declare name/value pairs to be passed into your templates. # name: value +Spark: + Path: "/opt/spark" + Master: Name: master Image: "k8s.gcr.io/spark"