Merge pull request #16320 from zmerlynn/spark-rcs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-29 01:42:31 -07:00
25 changed files with 355 additions and 231 deletions

View File

@@ -356,10 +356,11 @@ func TestExampleObjectSchemas(t *testing.T) {
"secret": &api.Secret{},
},
"../examples/spark": {
"spark-driver-controller": &api.ReplicationController{},
"spark-master-controller": &api.ReplicationController{},
"spark-master-service": &api.Service{},
"spark-master": &api.Pod{},
"spark-webui": &api.Service{},
"spark-worker-controller": &api.ReplicationController{},
"spark-driver": &api.Pod{},
},
"../examples/spark/spark-gluster": {
"spark-master-service": &api.Service{},