Merge pull request kubernetes#21899 from zmerlynn/update-spark

Auto commit by PR queue bot
xfye · Mar 12, 2016 · c9250bb · c9250bb
2 parents 7470405 + 6e2e7bd
commit c9250bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/examples/spark/spark-gluster/spark-master-controller.yaml b/examples/spark/spark-gluster/spark-master-controller.yaml
@@ -15,7 +15,8 @@ spec:
     spec:
       containers:
         - name: spark-master
-          image: gcr.io/google_containers/spark-master:1.5.1_v2
+          image: gcr.io/google_containers/spark:1.5.2_v1
+          command: ["/start-master"]
           ports:
             - containerPort: 7077
           volumeMounts:

diff --git a/examples/spark/spark-gluster/spark-worker-controller.yaml b/examples/spark/spark-gluster/spark-worker-controller.yaml
@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
         - name: spark-worker
-          image: gcr.io/google_containers/spark-worker:1.5.1_v2
+          image: gcr.io/google_containers/spark:1.5.2_v1
+          command: ["/start-worker"]
           ports:
             - containerPort: 8888
           volumeMounts:

diff --git a/examples/spark/spark-master-controller.yaml b/examples/spark/spark-master-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: spark-master
-          image: gcr.io/google_containers/spark:1.5.1_v3
+          image: gcr.io/google_containers/spark:1.5.2_v1
           command: ["/start-master"]
           ports:
             - containerPort: 7077

diff --git a/examples/spark/spark-worker-controller.yaml b/examples/spark/spark-worker-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: spark-worker
-          image: gcr.io/google_containers/spark:1.5.1_v3
+          image: gcr.io/google_containers/spark:1.5.2_v1
           command: ["/start-worker"]
           ports:
             - containerPort: 8081

diff --git a/examples/spark/zeppelin-controller.yaml b/examples/spark/zeppelin-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: zeppelin
-          image: gcr.io/google_containers/zeppelin:v0.5.5_v2
+          image: gcr.io/google_containers/zeppelin:v0.5.6_v1
           ports:
             - containerPort: 8080
           resources: