Merge pull request #6071 from lavalamp/fix2

Update network tester files to v1beta3
This commit is contained in:
Satnam Singh 2015-03-27 12:22:49 -07:00
commit 37689038d2
2 changed files with 46 additions and 31 deletions

View File

@ -1,29 +1,40 @@
{
"id": "nettestController",
"kind": "ReplicationController",
"apiVersion": "v1beta1",
"desiredState": {
"apiVersion": "v1beta3",
"metadata": {
"name": "nettest-controller",
"labels": {
"name": "nettest"
}
},
"spec": {
"replicas": 8,
"replicaSelector": {"name": "nettest"},
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "nettest",
"containers": [{
"selector": {
"name": "nettest"
},
"template": {
"metadata": {
"labels": {
"name": "nettest"
}
},
"spec": {
"containers": [
{
"name": "webserver",
"image": "kubernetes/nettest:latest",
"command": ["-service=nettest"],
"ports": [{
"containerPort": 8080
}]
}]
}
},
"labels": {
"name": "nettest"
}
"command": [
"-service=nettest"
],
"ports": [
{
"containerPort": 8080,
"protocol": "TCP"
}
]
}
]
}
},
"labels": {"name": "nettest"}
}
}
}

View File

@ -1,14 +1,18 @@
{
"id": "nettest",
"kind": "Service",
"apiVersion": "v1beta1",
"port": 8080,
"containerPort": 8080,
"selector": {
"name": "nettest"
"apiVersion": "v1beta3",
"metadata": {
"name": "nettest",
"labels": {
"name": "nettest"
}
},
"labels": {
"name": "nettest"
"spec": {
"port": 8080,
"protocol": "TCP",
"selector": {
"name": "nettest"
},
"targetPort": 8080,
}
}