Merge remote-tracking branch 'refs/remotes/kubernetes/master'

2016-10-26 06:49:09 -07:00
parent eb32f1323b bfd03fed97
commit ee6ce7828f
6 changed files with 455 additions and 74 deletions
@@ -10,6 +10,8 @@ toc:
    path: /docs/whatisk8s/
  - title: Installing Kubernetes on Linux with kubeadm
    path: /docs/getting-started-guides/kubeadm/
+  - title: Installing Kubernetes on AWS with kops
+    path: /docs/getting-started-guides/kops/
  - title: Hello World on Google Container Engine
    path: /docs/hellonode/
  - title: Downloading or Building Kubernetes