Merge pull request #10067 from lavalamp/miscFix

fix config file
pull/6/head
Satnam Singh 2015-06-18 17:48:07 -07:00
commit 3d8a3a809f
1 changed files with 16 additions and 34 deletions

View File

@ -2,51 +2,33 @@
"kind": "Pod", "kind": "Pod",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "kubectl-tester" "name": "porter"
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "bb", "name": "porter",
"image": "gcr.io/google_containers/busybox", "image": "gcr.io/google_containers/porter:91d46193649807d1340b46797774d8b2",
"command": [ "env": [
"sh", "-c", "sleep 5; wget -O - ${KUBERNETES_RO_SERVICE_HOST}:${KUBERNETES_RO_SERVICE_PORT}/api/v1/pods/; sleep 10000" {
"name": "SERVE_PORT_80",
"value": "foo"
},
{
"name": "SERVE_PORT_81",
"value": "<html><head></head><body><a href=\"/rewriteme\">rewritten link</a></body></html>"
}
], ],
"ports": [ "ports": [
{ {
"containerPort": 8080 "name": "p80",
} "containerPort": 80
],
"env": [
{
"name": "KUBERNETES_RO_SERVICE_HOST",
"value": "127.0.0.1"
}, },
{ {
"name": "KUBERNETES_RO_SERVICE_PORT", "name": "p81",
"value": "8001" "containerPort": 81
}
],
"volumeMounts": [
{
"name": "test-volume",
"mountPath": "/mount/test-volume"
} }
] ]
},
{
"name": "kubectl",
"image": "gcr.io/google_containers/kubectl:v0.18.0-120-gaeb4ac55ad12b1-dirty",
"imagePullPolicy": "Always",
"args": [
"proxy", "-p", "8001"
]
}
],
"volumes": [
{
"name": "test-volume",
"emptyDir": {}
} }
] ]
} }