[spark/stable] image changed to apache/zeppelin:0.7.3 (#3291)

* Changed zeppelin image to apache/zeppelin:0.7.3

Switched to environment variable arguments to be compatible with the new image

* Updated Readme default values

* [stable/spark] version bump
This commit is contained in:
Jonas Eckerström
2018-01-19 14:09:27 -08:00
committed by k8s-ci-robot
parent 2de9697eef
commit c365fb0b37
4 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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` |
@@ -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 }}"
+2 -2
View File
@@ -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"