Merge pull request #5765 from roberthbailey/pipefail

Specify bash when installing kubernetes via get.k8s.io.
This commit is contained in:
Brendan Burns 2015-03-23 14:05:39 -07:00
commit 7547eaec2b
3 changed files with 12 additions and 12 deletions

View File

@ -16,26 +16,26 @@
# Bring up a Kubernetes cluster. # Bring up a Kubernetes cluster.
# Usage: # Usage:
# wget -q -O - https://get.k8s.io | sh # wget -q -O - https://get.k8s.io | bash
# or # or
# curl -sS https://get.k8s.io | sh # curl -sS https://get.k8s.io | bash
# #
# Advanced options # Advanced options
# Set KUBERNETES_PROVIDER to choose between different providers: # Set KUBERNETES_PROVIDER to choose between different providers:
# Google Compute Engine [default] # Google Compute Engine [default]
# * export KUBERNETES_PROVIDER=gce; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=gce; wget -q -O - https://get.k8s.io | bash
# Google Container Engine # Google Container Engine
# * export KUBERNETES_PROVIDER=gke; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=gke; wget -q -O - https://get.k8s.io | bash
# Amazon EC2 # Amazon EC2
# * export KUBERNETES_PROVIDER=aws; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=aws; wget -q -O - https://get.k8s.io | bash
# Microsoft Azure # Microsoft Azure
# * export KUBERNETES_PROVIDER=azure; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=azure; wget -q -O - https://get.k8s.io | bash
# Vagrant (local virtual machines) # Vagrant (local virtual machines)
# * export KUBERNETES_PROVIDER=vagrant; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=vagrant; wget -q -O - https://get.k8s.io | bash
# VMWare VSphere # VMWare VSphere
# * export KUBERNETES_PROVIDER=vsphere; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=vsphere; wget -q -O - https://get.k8s.io | bash
# Rackspace # Rackspace
# * export KUBERNETES_PROVIDER=rackspace; wget -q -O - https://get.k8s.io | sh # * export KUBERNETES_PROVIDER=rackspace; wget -q -O - https://get.k8s.io | bash
# #
# Set KUBERNETES_SKIP_DOWNLOAD to non-empty to skip downloading a release. # Set KUBERNETES_SKIP_DOWNLOAD to non-empty to skip downloading a release.
# Set KUBERNETES_SKIP_CONFIRM to skip the installation confirmation prompt. # Set KUBERNETES_SKIP_CONFIRM to skip the installation confirmation prompt.

View File

@ -12,7 +12,7 @@ Setting up a cluster is as simple as running:
``` ```
export KUBERNETES_PROVIDER=vagrant export KUBERNETES_PROVIDER=vagrant
curl -sS https://get.k8s.io | sh curl -sS https://get.k8s.io | bash
``` ```
The `KUBERNETES_PROVIDER` environment variable tells all of the various cluster management scripts which variant to use. If you forget to set this, the assumption is you are running on Google Compute Engine. The `KUBERNETES_PROVIDER` environment variable tells all of the various cluster management scripts which variant to use. If you forget to set this, the assumption is you are running on Google Compute Engine.

View File

@ -24,11 +24,11 @@ gcloud config set project <project-name>
Next, grab the Kubernetes [release binary](https://github.com/GoogleCloudPlatform/kubernetes/releases). You can do this via: Next, grab the Kubernetes [release binary](https://github.com/GoogleCloudPlatform/kubernetes/releases). You can do this via:
```shell ```shell
wget -q -O - https://get.k8s.io | sh wget -q -O - https://get.k8s.io | bash
``` ```
or or
```shell ```shell
curl -sS https://get.k8s.io | sh curl -sS https://get.k8s.io | bash
``` ```
Then, start up a Kubernetes cluster as [described here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/gce.md). Then, start up a Kubernetes cluster as [described here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/gce.md).