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", "kind": "ReplicationController",
"apiVersion": "v1beta1", "apiVersion": "v1beta3",
"desiredState": { "metadata": {
"name": "nettest-controller",
"labels": {
"name": "nettest"
}
},
"spec": {
"replicas": 8, "replicas": 8,
"replicaSelector": {"name": "nettest"}, "selector": {
"podTemplate": { "name": "nettest"
"desiredState": { },
"manifest": { "template": {
"version": "v1beta1", "metadata": {
"id": "nettest", "labels": {
"containers": [{ "name": "nettest"
}
},
"spec": {
"containers": [
{
"name": "webserver", "name": "webserver",
"image": "kubernetes/nettest:latest", "image": "kubernetes/nettest:latest",
"command": ["-service=nettest"], "command": [
"ports": [{ "-service=nettest"
"containerPort": 8080 ],
}] "ports": [
}] {
} "containerPort": 8080,
}, "protocol": "TCP"
"labels": { }
"name": "nettest" ]
} }
]
} }
}, }
"labels": {"name": "nettest"} }
} }

View File

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