Skip to content

Commit

Permalink
Replace v1beta1 files with v1beta3
Browse files Browse the repository at this point in the history
  • Loading branch information
bcbroussard committed Apr 23, 2015
1 parent 24c26f2 commit e509b85
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 136 deletions.
26 changes: 19 additions & 7 deletions examples/spark/spark-master-service.json
@@ -1,9 +1,21 @@
{
"id": "spark-master",
"kind": "Service",
"apiVersion": "v1beta1",
"port": 7077,
"containerPort": 7077,
"selector": { "name": "spark-master" },
"labels": { "name": "spark-master" }
}
"apiVersion": "v1beta3",
"metadata": {
"name": "spark-master",
"labels": {
"name": "spark-master"
}
},
"spec": {
"ports": [
{
"port": 7077,
"targetPort": 7077
}
],
"selector": {
"name": "spark-master"
}
}
}
38 changes: 23 additions & 15 deletions examples/spark/spark-master.json
@@ -1,20 +1,28 @@
{
"id": "spark-master",
"kind": "Pod",
"apiVersion": "v1beta1",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "spark-master",
"containers": [{
"name": "spark-master",
"image": "mattf/spark-master",
"cpu": 100,
"ports": [{ "containerPort": 7077 }]
}]
"apiVersion": "v1beta3",
"metadata": {
"name": "spark-master",
"labels": {
"name": "spark-master"
}
},
"labels": {
"name": "spark-master"
"spec": {
"containers": [
{
"name": "spark-master",
"image": "mattf/spark-master",
"ports": [
{
"containerPort": 7077
}
],
"resources": {
"limits": {
"cpu": "100m"
}
}
}
]
}
}
}
59 changes: 37 additions & 22 deletions examples/spark/spark-worker-controller.json
@@ -1,28 +1,43 @@
{
"id": "spark-worker-controller",
"kind": "ReplicationController",
"apiVersion": "v1beta1",
"desiredState": {
"apiVersion": "v1beta3",
"metadata": {
"name": "spark-worker-controller",
"labels": {
"name": "spark-worker"
}
},
"spec": {
"replicas": 3,
"replicaSelector": {"name": "spark-worker"},
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "spark-worker-controller",
"containers": [{
"name": "spark-worker",
"image": "mattf/spark-worker",
"cpu": 100,
"ports": [{"containerPort": 8888, "hostPort": 8888}]
}]
}
"selector": {
"name": "spark-worker"
},
"template": {
"metadata": {
"labels": {
"name": "spark-worker",
"uses": "spark-master"
}
},
"labels": {
"name": "spark-worker",
"uses": "spark-master"
"spec": {
"containers": [
{
"name": "spark-worker",
"image": "mattf/spark-worker",
"ports": [
{
"hostPort": 8888,
"containerPort": 8888
}
],
"resources": {
"limits": {
"cpu": "100m"
}
}
}
]
}
}
},
"labels": {"name": "spark-worker"}
}
}
}
21 changes: 0 additions & 21 deletions examples/spark/v1beta3/spark-master-service.json

This file was deleted.

28 changes: 0 additions & 28 deletions examples/spark/v1beta3/spark-master.json

This file was deleted.

43 changes: 0 additions & 43 deletions examples/spark/v1beta3/spark-worker-controller.json

This file was deleted.

0 comments on commit e509b85

Please sign in to comment.