diff --git a/stable/spark/Chart.yaml b/stable/spark/Chart.yaml index a96e7a4b01..45c5d810d1 100755 --- a/stable/spark/Chart.yaml +++ b/stable/spark/Chart.yaml @@ -1,5 +1,5 @@ name: spark -version: 0.1.7 +version: 0.1.9 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/README.md b/stable/spark/README.md index 079e531b1c..71bb67efd0 100644 --- a/stable/spark/README.md +++ b/stable/spark/README.md @@ -78,8 +78,8 @@ The following tables lists the configurable parameters of the Spark chart and th | Parameter | Description | Default | |-------------------------|----------------------------------|----------------------------------------------------------| | `Zeppelin.Name` | Zeppelin name | `zeppelin-controller` | -| `Zeppelin.Image` | Container image name | `k8s.gcr.io/zeppelin` | -| `Zeppelin.ImageTag` | Container image tag | `v0.5.5_v2` | +| `Zeppelin.Image` | Container image name | `apache/zeppelin` | +| `Zeppelin.ImageTag` | Container image tag | `0.7.3` | | `Zeppelin.Replicas` | k8s deployment replicas | `1` | | `Zeppelin.Component` | k8s selector key | `zeppelin` | | `Zeppelin.Cpu` | container requested cpu | `100m` | diff --git a/stable/spark/templates/spark-zeppelin-deployment.yaml b/stable/spark/templates/spark-zeppelin-deployment.yaml index 21dff346c0..a26a86df7e 100644 --- a/stable/spark/templates/spark-zeppelin-deployment.yaml +++ b/stable/spark/templates/spark-zeppelin-deployment.yaml @@ -42,10 +42,11 @@ spec: containers: - name: {{ template "zeppelin-fullname" . }} image: "{{ .Values.Zeppelin.Image }}:{{ .Values.Zeppelin.ImageTag }}" - command: ["/bin/sh","-c"] - args: ["sed -i.bak s/spark-master:7077/{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}/g /opt/zeppelin/conf/zeppelin-env.sh; /opt/zeppelin/bin/docker-zeppelin.sh"] ports: - containerPort: {{ .Values.Zeppelin.ContainerPort }} resources: requests: cpu: "{{ .Values.Zeppelin.Cpu }}" + env: + - name: SPARK_MASTER + value: "spark://{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}" \ No newline at end of file diff --git a/stable/spark/values.yaml b/stable/spark/values.yaml index 07a6b9de9c..4a9a92e58d 100644 --- a/stable/spark/values.yaml +++ b/stable/spark/values.yaml @@ -37,8 +37,8 @@ Worker: Zeppelin: Name: zeppelin - Image: "k8s.gcr.io/zeppelin" - ImageTag: "v0.5.5_v2" + Image: "apache/zeppelin" + ImageTag: "0.7.3" Replicas: 1 Component: "zeppelin" Cpu: "100m"