Merge pull request kubernetes#5765 from roberthbailey/pipefail

Specify bash when installing kubernetes via get.k8s.io.
duda · Mar 23, 2015 · 7547eae · 7547eae
2 parents df67250 + a7bc9ed
commit 7547eae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh
@@ -16,26 +16,26 @@
 
 # Bring up a Kubernetes cluster.
 # Usage:
-#   wget -q -O - https://get.k8s.io | sh
+#   wget -q -O - https://get.k8s.io | bash
 # or
-#   curl -sS https://get.k8s.io | sh
+#   curl -sS https://get.k8s.io | bash
 #
 # Advanced options
 #  Set KUBERNETES_PROVIDER to choose between different providers:
 #  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
-#   * 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
-#   * 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
-#   * 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)
-#   * 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
-#   * 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
-#   * 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_CONFIRM to skip the installation confirmation prompt.

diff --git a/docs/getting-started-guides/vagrant.md b/docs/getting-started-guides/vagrant.md
@@ -12,7 +12,7 @@ Setting up a cluster is as simple as running:
 
 ```
 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.

diff --git a/examples/mysql-wordpress-pd/README.md b/examples/mysql-wordpress-pd/README.md
@@ -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:
 ```shell
-wget -q -O - https://get.k8s.io | sh
+wget -q -O - https://get.k8s.io | bash
 ```
 or
 ```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).