github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Use curl exclusively in vSphere deployment

Browse Source 
This fixes #2295.
This commit is contained in:
Pieter Noordhuis 2014-11-11 16:12:16 -08:00
parent c8f64a28dd
commit 1df6f9ce6a
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/vsphere/templates/salt-master.sh
View File

@ -50,7 +50,5 @@ EOF
# #
# -M installs the master # -M installs the master
set +x set +x
wget -q -O - https://bootstrap.saltstack.com | sh -s -- -M -X curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M -X
set -x set -x
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd

2
cluster/vsphere/templates/salt-minion.sh
View File

@ -48,4 +48,4 @@ EOF
# #
# We specify -X to avoid a race condition that can cause minion failure to # We specify -X to avoid a race condition that can cause minion failure to
# install. See https://github.com/saltstack/salt-bootstrap/issues/270 # install. See https://github.com/saltstack/salt-bootstrap/issues/270
wget -q -O - https://bootstrap.saltstack.com | sh -s -- -X curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X

8
docs/getting-started-guides/vsphere.md
View File

@ -27,15 +27,15 @@ convenient).
### Setup ### Setup
Download a prebuilt Debian VMDK to be used as base image: Download a prebuilt Debian 7.7 VMDK that we'll use as a base image:
```sh ```sh
wget https://storage.googleapis.com/govmomi/vmdk/kube.vmdk.gz{,.md5} curl --remote-name-all https://storage.googleapis.com/govmomi/vmdk/2014-11-11/kube.vmdk.gz{,.md5}
md5sum -c kube.vmdk.gz.md5 md5sum -c kube.vmdk.gz.md5
gzip -d kube.vmdk.gz gzip -d kube.vmdk.gz
``` ```
Upload this VMDK to your vSphere instance: Import this VMDK into your vSphere datastore:
```sh ```sh
export GOVC_URL='user:pass@hostname' export GOVC_URL='user:pass@hostname'
@ -46,7 +46,7 @@ export GOVC_RESOURCE_POOL='resource pool or cluster with access to datastore'
govc import.vmdk kube.vmdk ./kube/ govc import.vmdk kube.vmdk ./kube/
``` ```
Verify that the VMDK was correctly uploaded and expanded to 10GiB: Verify that the VMDK was correctly uploaded and expanded to ~3GiB:
```sh ```sh
govc datastore.ls ./kube/ govc datastore.ls ./kube/