From a7bc9edb96297014f51af285bb8573007b0a6c1c Mon Sep 17 00:00:00 2001 From: Robert Bailey Date: Sat, 21 Mar 2015 22:50:29 -0700 Subject: [PATCH] Specify bash when installing kubernetes via get.k8s.io. Fixes #5689. --- cluster/get-kube.sh | 18 +++++++++--------- docs/getting-started-guides/vagrant.md | 2 +- examples/mysql-wordpress-pd/README.md | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh index d72276b2e2b..f6cd2842018 100755 --- 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 index bcc6d4a4818..f2ac40ab1d7 100644 --- 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 index ef6bfef7c27..41eca93a89d 100644 --- a/examples/mysql-wordpress-pd/README.md +++ b/examples/mysql-wordpress-pd/README.md @@ -24,11 +24,11 @@ gcloud config set project 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).