From c535d6d30b43cc3aaa0e557d078b76818d0b8d8a Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Mon, 25 Aug 2014 10:01:25 -0700 Subject: [PATCH] Incorporate comments --- README.md | 1 + cluster/saltbase/salt/static-routes/init.sls | 2 +- docs/getting-started-guides/vsphere.md | 23 ++++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8da27e0734b00..f560150dbf83e 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ While the concepts and architecture in Kubernetes represent years of experience * [Locally](docs/getting-started-guides/locally.md) * [CoreOS](docs/getting-started-guides/coreos.md) * [Fedora](docs/getting-started-guides/fedora.md) + * [vSphere](docs/getting-started-guides/vsphere.md) * [kubecfg command line tool](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/cli.md) * [Kubernetes API Documentation](http://cdn.rawgit.com/GoogleCloudPlatform/kubernetes/ce4fcc4ad89ed7b481a46a0ad4c99dee4c6f24ba/api/kubernetes.html) * [Discussion and Community Support](#community-discussion-and-support) diff --git a/cluster/saltbase/salt/static-routes/init.sls b/cluster/saltbase/salt/static-routes/init.sls index 4416dbe5da0c7..3a01c55c949b4 100644 --- a/cluster/saltbase/salt/static-routes/init.sls +++ b/cluster/saltbase/salt/static-routes/init.sls @@ -19,7 +19,7 @@ - group: root - mode: 755 -refresh routes: +refresh-routes: cmd.wait_script: - source: salt://static-routes/refresh - cwd: /etc/network/ diff --git a/docs/getting-started-guides/vsphere.md b/docs/getting-started-guides/vsphere.md index ce2f27c64ca6e..b086bf661b482 100644 --- a/docs/getting-started-guides/vsphere.md +++ b/docs/getting-started-guides/vsphere.md @@ -4,22 +4,31 @@ 1. You need administrator credentials to an ESXi machine or vCenter instance. 2. You must have Go (version 1.2 or later) installed: [www.golang.org](http://www.golang.org). -3. Install the govc tool to interact with ESXi/vCenter: +3. You must have your `GOPATH` set up and include `$GOPATH/bin` in your `PATH`. + + ```sh + export GOPATH=$HOME/src/go + mkdir -p $GOPATH + export PATH=$PATH:$GOPATH/bin + ``` + +4. Install the govc tool to interact with ESXi/vCenter: ```sh go get github.com/vmware/govmomi/govc ``` -4. Install godep: + +5. Install godep: ```sh - export GOBIN=/usr/local/go/bin go get github.com/tools/godep ``` -5. Get the Kubernetes source: +6. Get the Kubernetes source: ```sh - git clone https://github.com/GoogleCloudPlatform/kubernetes.git + go get github.com/GoogleCloudPlatform/kubernetes + cd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes ``` ### Setup @@ -27,7 +36,7 @@ Download a prebuilt Debian VMDK to be used as base image: ```sh -wget http://storage.googleapis.com/govmomi/vmdk/kube.vmdk.gz{,.md5} +wget https://storage.googleapis.com/govmomi/vmdk/kube.vmdk.gz{,.md5} md5sum -c kube.vmdk.gz.md5 gzip -d kube.vmdk.gz ``` @@ -53,7 +62,7 @@ parameters. The guest login for the image that you imported is `kube:kube`. Now, let's continue with deploying Kubernetes: -``` +```sh cd kubernetes # Build a release