From a067e7f41c57a7ee440923ecc195ea9b20729a11 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:29:47 +0000 Subject: [PATCH 01/10] Menu text --- _includes/head-header.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/head-header.html b/_includes/head-header.html index 8c12920cf9..51a95ece80 100644 --- a/_includes/head-header.html +++ b/_includes/head-header.html @@ -28,15 +28,15 @@

Documentation

-

Pellentesque in ipsum id orci porta dapibus. Nulla porttitor accumsan tincidunt.

+

Learn how to use Kubernetes with the use of walkthroughs, samples, and reference documentation. You can even help contribute to the docs!

Community

-

Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui.

+

If you need help, connect with other Kubernetes users and the Kubernetes authors for support. You can also attend any community events on our Google Calendar, and watch video presentations from around the web.

Blog

-

Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Quisque velit nisi, pretium ut lacinia in.

+

Read the latest news for Kubernetes and the containers space in general, and get technical how-tos hot off the presses.

From 77e42984a0d16a6937efa362fe1d492f193a2119 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:30:56 +0000 Subject: [PATCH 02/10] Menu text --- _includes/head-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head-header.html b/_includes/head-header.html index 51a95ece80..31ff6ae61c 100644 --- a/_includes/head-header.html +++ b/_includes/head-header.html @@ -24,7 +24,7 @@

Get Started

-

Built for a multi-cloud world, public, private or hybrid. Seamlessly roll out new features.

+

Ready to get your hands dirty? Build a simple Kubernetes cluster that runs "Hello World" for Node.js.

Documentation

From c9f725e7771caaa911bb6fd0ebb8553d5c141f7c Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:33:32 +0000 Subject: [PATCH 03/10] Shortening Community text for menu --- _includes/head-header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head-header.html b/_includes/head-header.html index 31ff6ae61c..f362891733 100644 --- a/_includes/head-header.html +++ b/_includes/head-header.html @@ -32,7 +32,7 @@

Community

-

If you need help, connect with other Kubernetes users and the Kubernetes authors for support. You can also attend any community events on our Google Calendar, and watch video presentations from around the web.

+

If you need help, you can connect with other Kubernetes users and the Kubernetes authors, attend community events, and watch video presentations from around the web.

Blog

From ba9623ee78f22a7af06b1fc0799948823318cf63 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:35:17 +0000 Subject: [PATCH 04/10] Delete imports.txt --- imports.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 imports.txt diff --git a/imports.txt b/imports.txt deleted file mode 100644 index 9c28cac7e7..0000000000 --- a/imports.txt +++ /dev/null @@ -1,7 +0,0 @@ -https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml,docs/getting-started-guides/fluentd-gcp.yaml -https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/examples/blog-logging/counter-pod.yaml,docs/getting-started-guides/counter-pod.yaml -https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/examples/blog-logging/counter-pod.yaml,docs/user-guide/counter-pod.yaml -https://raw.githubusercontent.com/kubernetes/kubernetes/gh-pages/_includes/v1.1/extensions-v1beta1-definitions.html,_includes/v1.1/extensions-v1beta1-definitions.html -https://raw.githubusercontent.com/kubernetes/kubernetes/gh-pages/_includes/v1.1/extensions-v1beta1-operations.html,_includes/v1.1/extensions-v1beta1-operations.html -https://raw.githubusercontent.com/kubernetes/kubernetes/gh-pages/_includes/v1.1/v1-definitions.html,_includes/v1.1/v1-definitions.html -https://raw.githubusercontent.com/kubernetes/kubernetes/gh-pages/_includes/v1.1/v1-operations.html,_includes/v1.1/v1-operations.html \ No newline at end of file From 0bd76103be15f681f84c8c408939981bac672108 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:48:49 +0000 Subject: [PATCH 05/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index 11eb0bb83c..5b38bf677c 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -23,5 +23,28 @@ make release For more details on the release process see the [`build/` directory](http://releases.k8s.io/{{page.githubbranch}}/build/) +#### Downloading Kubernetes and automatically set up clusters +The bash script at `https://get.k8s.io`, which can be run with `wget` or `curl`, automatically downloads Kubernetes, and provisions a cluster based on your desired cloud provider. +```shell +# wget version +export KUBERNETES_PROVIDER=YOUR_PROVIDER; wget -q -O - https://get.k8s.io | bash + +# curl version +export KUBERNETES_PROVIDER=YOUR_PROVIDER; curl -sS https://get.k8s.io | bash +``` + +Possible values for `YOUR_PROVIDER` include: + +* `gce` - Google Compute Engine [default] +* `gke` - Google Container Engine +* `aws` - Amazon EC2 +* `azure` - Microsoft Azure +* `vagrant` - Vagrant (on local virtual machines) +* `vsphere` - VMWare VSphere +* `rackspace` - Rackspace + +For the complete, up-to-date list of supported providers, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. + +You can also set `KUBERNETES_SKIP_DOWNLOAD` to non-empty to skip downloading a release and just provision the clusters, or set `KUBERNETES_SKIP_CONFIRM` to skip the installation confirmation prompt. From 2dcdc6049c782d10a3969bb3a223902d1ed95832 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:52:13 +0000 Subject: [PATCH 06/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index 5b38bf677c..a7e7d314e8 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -45,6 +45,4 @@ Possible values for `YOUR_PROVIDER` include: * `vsphere` - VMWare VSphere * `rackspace` - Rackspace -For the complete, up-to-date list of supported providers, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. - -You can also set `KUBERNETES_SKIP_DOWNLOAD` to non-empty to skip downloading a release and just provision the clusters, or set `KUBERNETES_SKIP_CONFIRM` to skip the installation confirmation prompt. +For the complete, up-to-date list of supported providers, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them. From 26c41708b5318a7f5ffd200081ceb1ea32d1d416 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:53:23 +0000 Subject: [PATCH 07/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index a7e7d314e8..7524556cf2 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -1,7 +1,10 @@ --- --- -You can either build a release from sources or download a pre-built release. If you do not plan on developing Kubernetes itself, we suggest a pre-built release. +You can either build a release from sources or download a pre-built release. If you do not plan on developing Kubernetes itself, we suggest a pre-built release. + +* TOC +{:toc} ### Prebuilt Binary Release From e065008863679a3fd1c54c4f5dd50e09d50e32fb Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:56:40 +0000 Subject: [PATCH 08/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index 7524556cf2..911f154087 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -26,7 +26,7 @@ make release For more details on the release process see the [`build/` directory](http://releases.k8s.io/{{page.githubbranch}}/build/) -#### Downloading Kubernetes and automatically set up clusters +#### Download Kubernetes and automatically set up a default cluster The bash script at `https://get.k8s.io`, which can be run with `wget` or `curl`, automatically downloads Kubernetes, and provisions a cluster based on your desired cloud provider. @@ -48,4 +48,4 @@ Possible values for `YOUR_PROVIDER` include: * `vsphere` - VMWare VSphere * `rackspace` - Rackspace -For the complete, up-to-date list of supported providers, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them. +For the complete, up-to-date list of providers supported by this script, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them. From f6dd3299fb22b43d04cfe6aca302e1e901935ef9 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:58:34 +0000 Subject: [PATCH 09/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index 911f154087..9c410ce175 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -48,4 +48,4 @@ Possible values for `YOUR_PROVIDER` include: * `vsphere` - VMWare VSphere * `rackspace` - Rackspace -For the complete, up-to-date list of providers supported by this script, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster) (each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them. +For the complete, up-to-date list of providers supported by this script, see [the `/cluster` folder in the main Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster), where each folder represents a possible value for `YOUR_PROVIDER`. If you don't see your desired provider, try looking at our [getting started guides](/docs/getting-started-guides); there's a good chance we have docs for them. From fad094151fa395f6ab8530db5726d126134c010e Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 8 Mar 2016 07:59:50 +0000 Subject: [PATCH 10/10] Update binary_release.md --- docs/getting-started-guides/binary_release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/binary_release.md b/docs/getting-started-guides/binary_release.md index 9c410ce175..1df329d620 100644 --- a/docs/getting-started-guides/binary_release.md +++ b/docs/getting-started-guides/binary_release.md @@ -26,7 +26,7 @@ make release For more details on the release process see the [`build/` directory](http://releases.k8s.io/{{page.githubbranch}}/build/) -#### Download Kubernetes and automatically set up a default cluster +### Download Kubernetes and automatically set up a default cluster The bash script at `https://get.k8s.io`, which can be run with `wget` or `curl`, automatically downloads Kubernetes, and provisions a cluster based on your desired cloud provider.