Commit Graph

11 Commits (83139a2acf3d82569fda1ae920baa5dca91b6b3f)

Author SHA1 Message Date
Alexander Kanevskiy 9cd582fd7a Append note about content and format of /etc/kubernetes/cloud-config. 2016-12-28 13:38:09 +02:00
yanan Lee fbf57b224f spelling error
Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Incorrect spelling

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

spelling error

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Incorrect spelling

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Revert "Incorrect spelling"

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix a typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix a typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-23 08:01:52 +08:00
Ben Balter 5bab707a82 Merge branch 'master' into inline-titles 2016-12-19 18:46:34 -05:00
Lucas Käldström 09e40e26b3 Update the kubeadm documentation to v1.5 2016-12-16 16:29:28 +02:00
Ben Balter bfa604351f add explicit titles to docs 2016-12-15 15:16:54 -05:00
dbaumgarten 061a332ac4 Wrong path for cloud-config in kubeadm.md
The cloud-config file should be located under `/etc/kubernetes/cloud-config` instead of /etc/kubernetes/cloud-config.json.
(See: https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L41 )
If the file is not in this location the controller-manager will fail to start, as he is given the --cloud-provider option without --cloud-config. (--cloud-config will only be used when  `/etc/kubernetes/cloud-config` exists https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L367 )
2016-12-15 14:58:46 +01:00
Lucas Käldström 05f67bad8f Update the kubeadm documentation to reflect the new release 2016-11-06 15:29:11 -08:00
Joe Beda 71de608f4d Document kubeadm evn variables 2016-10-24 09:41:39 -07:00
Joe Beda e21ed27c58 Document kubeadm automation. 2016-10-24 09:41:39 -07:00
Devan Goodwin 4fd44b1604 Document kubeadm --skip-preflight-checks. 2016-10-24 11:50:34 -03:00
Lucas Käldström 23d7719663 Move kubeadm reference, add a navigation link to it and assignees 2016-10-11 09:01:12 +03:00