whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into updating-aws-install

Browse Source
This commit is contained in:
Chris Love
2016-11-01 11:54:39 -06:00
committed by GitHub
parent c4da909199 b5f9257c11
commit e57b1141c9
6 changed files with 126 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/getting-started-guides/kubeadm.md
+1 -1
View File
@@ -34,7 +34,7 @@ orchestration system (e.g. Puppet) that you have to integrate with.
If you are not constrained, other tools build on kubeadm to give you complete clusters:
* On GCE, [Google Container Engine](https://cloud.google.com/container-engine/) gives you turn-key Kubernetes
* On AWS, [kops](kops) makes installation and cluster management easy (and supports high availability)
* On AWS, [kops](https://github.com/kubernetes/kops) makes installation and cluster management easy (and supports high availability)
## Prerequisites