Merge pull request #20934 from mattf/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-09 16:05:03 -08:00
commit 6bac4fdc37
2 changed files with 4 additions and 2 deletions

View File

@ -13,7 +13,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.1_v3
command: ["/start-master"]
ports:
- containerPort: 7077
- containerPort: 8080

View File

@ -13,7 +13,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.1_v3
command: ["/start-worker"]
ports:
- containerPort: 8081
resources: