remove v1beta3 examples from getting started from scratch guide

This commit is contained in:
Mike Danese 2015-07-07 12:28:42 -07:00 committed by Mike Danese
parent 127fe8d4a5
commit 57f235a99f

View File

@ -509,61 +509,75 @@ If you are using the HTTPS approach, then set:
*TODO* document proxy-ssh setup. *TODO* document proxy-ssh setup.
#### Apiserver pod template #### Apiserver pod template
*TODO*: convert to version v1.
```json ```json
{ {
"apiVersion": "v1beta3", "kind": "Pod",
"kind": "Pod", "apiVersion": "v1",
"metadata": {"name":"kube-apiserver"}, "metadata": {
"spec":{ "name": "kube-apiserver"
"hostNetwork": true, },
"containers":[ "spec": {
{ "hostNetwork": true,
"name": "kube-apiserver", "containers": [
"image": "${APISERVER_IMAGE}", {
"command": [ "name": "kube-apiserver",
"/bin/sh", "image": "${APISERVER_IMAGE}",
"-c", "command": [
"/usr/local/bin/kube-apiserver $ARGS" "/bin/sh",
], "-c",
"livenessProbe": { "/usr/local/bin/kube-apiserver $ARGS"
"httpGet": {
"path": "/healthz",
"port": 8080
},
"initialDelaySeconds": 15,
"timeoutSeconds": 15
},
"ports":[
{ "name": "https",
"containerPort": 443,
"hostPort": 443},
{ "name": "local",
"containerPort": 8080,
"hostPort": 8080}
], ],
"volumeMounts": [ "ports": [
{ "name": "srvkube", {
"mountPath": "/srv/kubernetes", "name": "https",
"readOnly": true}, "hostPort": 443,
{ "name": "etcssl", "containerPort": 443
"mountPath": "/etc/ssl", },
"readOnly": true}, {
] "name": "local",
} "hostPort": 8080,
], "containerPort": 8080
"volumes":[ }
{ "name": "srvkube", ],
"hostPath": { "volumeMounts": [
"path": "/srv/kubernetes"} {
}, "name": "srvkube",
{ "name": "etcssl", "mountPath": "/srv/kubernetes",
"hostPath": { "readOnly": true
"path": "/etc/ssl"} },
}, {
] "name": "etcssl",
}} "mountPath": "/etc/ssl",
"readOnly": true
}
],
"livenessProbe": {
"httpGet": {
"path": "/healthz",
"port": 8080
},
"initialDelaySeconds": 15,
"timeoutSeconds": 15
}
}
],
"volumes": [
{
"name": "srvkube",
"hostPath": {
"path": "/srv/kubernetes"
}
},
{
"name": "etcssl",
"hostPath": {
"path": "/etc/ssl"
}
}
]
}
}
``` ```
The `/etc/ssl` mount allows the apiserver to find the SSL root certs so it can The `/etc/ssl` mount allows the apiserver to find the SSL root certs so it can
@ -604,36 +618,37 @@ Otherwise, you will need to manually create node objects.
### Scheduler ### Scheduler
*TODO*: convert to version v1.
Complete this template for the scheduler pod: Complete this template for the scheduler pod:
``` ```json
{ {
"apiVersion": "v1beta3", "kind": "Pod",
"kind": "Pod", "apiVersion": "v1",
"metadata": {"name":"kube-scheduler"}, "metadata": {
"spec":{ "name": "kube-scheduler"
"hostNetwork": true, },
"containers":[ "spec": {
{ "hostNetwork": true,
"name": "kube-scheduler", "containers": [
"image": "$SCHEDULER_IMAGE", {
"command": [ "name": "kube-scheduler",
"/bin/sh", "image": "$SCHEDULER_IMAGE",
"-c", "command": [
"/usr/local/bin/kube-scheduler --master=127.0.0.1:8080" "/bin/sh",
], "-c",
"livenessProbe": { "/usr/local/bin/kube-scheduler --master=127.0.0.1:8080"
"httpGet": { ],
"path": "/healthz", "livenessProbe": {
"port": 10251 "httpGet": {
}, "path": "/healthz",
"initialDelaySeconds": 15, "port": 10251
"timeoutSeconds": 15 },
}, "initialDelaySeconds": 15,
} "timeoutSeconds": 15
], }
}} }
]
}
}
``` ```
Optionally, you may want to mount `/var/log` as well and redirect output there. Optionally, you may want to mount `/var/log` as well and redirect output there.
@ -656,51 +671,62 @@ Flags to consider using with controller manager.
- `--master=127.0.0.1:8080` - `--master=127.0.0.1:8080`
Template for controller manager pod: Template for controller manager pod:
``` ```json
{ {
"apiVersion": "v1beta3", "kind": "Pod",
"kind": "Pod", "apiVersion": "v1",
"metadata": {"name":"kube-controller-manager"}, "metadata": {
"spec":{ "name": "kube-controller-manager"
"hostNetwork": true, },
"containers":[ "spec": {
{ "hostNetwork": true,
"name": "kube-controller-manager", "containers": [
"image": "$CNTRLMNGR_IMAGE", {
"command": [ "name": "kube-controller-manager",
"/bin/sh", "image": "$CNTRLMNGR_IMAGE",
"-c", "command": [
"/usr/local/bin/kube-controller-manager $ARGS" "/bin/sh",
], "-c",
"livenessProbe": { "/usr/local/bin/kube-controller-manager $ARGS"
"httpGet": { ],
"path": "/healthz", "volumeMounts": [
"port": 10252 {
"name": "srvkube",
"mountPath": "/srv/kubernetes",
"readOnly": true
},
{
"name": "etcssl",
"mountPath": "/etc/ssl",
"readOnly": true
}
],
"livenessProbe": {
"httpGet": {
"path": "/healthz",
"port": 10252
},
"initialDelaySeconds": 15,
"timeoutSeconds": 15
}
}
],
"volumes": [
{
"name": "srvkube",
"hostPath": {
"path": "/srv/kubernetes"
}
}, },
"initialDelaySeconds": 15, {
"timeoutSeconds": 15 "name": "etcssl",
}, "hostPath": {
"volumeMounts": [ "path": "/etc/ssl"
{ "name": "srvkube", }
"mountPath": "/srv/kubernetes", }
"readOnly": true}, ]
{ "name": "etcssl", }
"mountPath": "/etc/ssl", }
"readOnly": true},
]
}
],
"volumes":[
{ "name": "srvkube",
"hostPath": {
"path": "/srv/kubernetes"}
},
{ "name": "etcssl",
"hostPath": {
"path": "/etc/ssl"}
},
]
}}
``` ```