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,16 +509,17 @@ 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,
"containers": [
{ {
"name": "kube-apiserver", "name": "kube-apiserver",
"image": "${APISERVER_IMAGE}", "image": "${APISERVER_IMAGE}",
@ -527,6 +528,30 @@ If you are using the HTTPS approach, then set:
"-c", "-c",
"/usr/local/bin/kube-apiserver $ARGS" "/usr/local/bin/kube-apiserver $ARGS"
], ],
"ports": [
{
"name": "https",
"hostPort": 443,
"containerPort": 443
},
{
"name": "local",
"hostPort": 8080,
"containerPort": 8080
}
],
"volumeMounts": [
{
"name": "srvkube",
"mountPath": "/srv/kubernetes",
"readOnly": true
},
{
"name": "etcssl",
"mountPath": "/etc/ssl",
"readOnly": true
}
],
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {
"path": "/healthz", "path": "/healthz",
@ -534,36 +559,25 @@ If you are using the HTTPS approach, then set:
}, },
"initialDelaySeconds": 15, "initialDelaySeconds": 15,
"timeoutSeconds": 15 "timeoutSeconds": 15
}, }
"ports":[ }
{ "name": "https",
"containerPort": 443,
"hostPort": 443},
{ "name": "local",
"containerPort": 8080,
"hostPort": 8080}
], ],
"volumeMounts": [ "volumes": [
{ "name": "srvkube", {
"mountPath": "/srv/kubernetes", "name": "srvkube",
"readOnly": true}, "hostPath": {
{ "name": "etcssl", "path": "/srv/kubernetes"
"mountPath": "/etc/ssl", }
"readOnly": true}, },
{
"name": "etcssl",
"hostPath": {
"path": "/etc/ssl"
}
}
] ]
} }
], }
"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,17 +618,17 @@ 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,
"containers": [
{ {
"name": "kube-scheduler", "name": "kube-scheduler",
"image": "$SCHEDULER_IMAGE", "image": "$SCHEDULER_IMAGE",
@ -630,10 +644,11 @@ Complete this template for the scheduler pod:
}, },
"initialDelaySeconds": 15, "initialDelaySeconds": 15,
"timeoutSeconds": 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,14 +671,16 @@ 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,
"containers": [
{ {
"name": "kube-controller-manager", "name": "kube-controller-manager",
"image": "$CNTRLMNGR_IMAGE", "image": "$CNTRLMNGR_IMAGE",
@ -672,6 +689,18 @@ Template for controller manager pod:
"-c", "-c",
"/usr/local/bin/kube-controller-manager $ARGS" "/usr/local/bin/kube-controller-manager $ARGS"
], ],
"volumeMounts": [
{
"name": "srvkube",
"mountPath": "/srv/kubernetes",
"readOnly": true
},
{
"name": "etcssl",
"mountPath": "/etc/ssl",
"readOnly": true
}
],
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {
"path": "/healthz", "path": "/healthz",
@ -679,28 +708,25 @@ Template for controller manager pod:
}, },
"initialDelaySeconds": 15, "initialDelaySeconds": 15,
"timeoutSeconds": 15 "timeoutSeconds": 15
}
}
],
"volumes": [
{
"name": "srvkube",
"hostPath": {
"path": "/srv/kubernetes"
}
}, },
"volumeMounts": [ {
{ "name": "srvkube", "name": "etcssl",
"mountPath": "/srv/kubernetes", "hostPath": {
"readOnly": true}, "path": "/etc/ssl"
{ "name": "etcssl", }
"mountPath": "/etc/ssl", }
"readOnly": true},
] ]
} }
], }
"volumes":[
{ "name": "srvkube",
"hostPath": {
"path": "/srv/kubernetes"}
},
{ "name": "etcssl",
"hostPath": {
"path": "/etc/ssl"}
},
]
}}
``` ```