Fix docs somewhat, add monitoring hooks.

satnam6502 · Nov 11, 2014 · 48498cf · 48498cf
1 parent 8a29549
commit 48498cf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
@@ -105,6 +105,20 @@ function ensure-temp-dir {
   fi
 }
 
+function setup-monitoring {
+  if [ ${MONITORING-} ]; then
+    # TODO: Implement this.
+    echo "Monitoring not currently supported on AWS"
+  fi
+}
+
+function teardown-monitoring {
+  if [ ${MONITORING-} ]; then
+    # TODO: Implement this.
+    echo "Monitoring not currently supported on AWS"
+  fi
+}
+
 # Verify and find the various tar files that we are going to use on the server.
 #
 # Vars set:
@@ -143,12 +157,12 @@ function upload-server-tars() {
   SERVER_BINARY_TAR_URL=
   SALT_TAR_URL=
 
-  local project_hash
-  local key = $(aws configure get aws_access_key_id)
+  local project_hash=
+  local key=$(aws configure get aws_access_key_id)
   if which md5 > /dev/null 2>&1; then
-    project_hash = $(md5 -q -s "${USER} ${key}")
+    project_hash=$(md5 -q -s "${USER} ${key}")
   else
-    project_hash = $(echo -n "${USER} ${key}" | md5sum)
+    project_hash=$(echo -n "${USER} ${key}" | md5sum)
   fi
   local -r staging_bucket="kubernetes-staging-${project_hash}"
 

diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md
@@ -5,11 +5,18 @@
 1. You need an AWS account. Visit [http://aws.amazon.com](http://aws.amazon.com) to get started
 2. Install and configure [AWS Command Line Interface](http://aws.amazon.com/cli)
 
-### Run from a binary release
+### Cluster turnup
 
-1. Download the [binary release](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/binary_release.md)
+#### Option 1: Install a binary release
+
+1. Download the [binary release](getting-started-guides/binary_release.md)
 2. Unpack the archive and ```cd kubernetes```
-3. Turn up the cluster:
+
+#### Option 2: Install from source
+1. ```git clone https://github.com/GoogleCloudPlatform/kubernetes.git```
+2. ```cd kubernetes; make release```
+
+#### Turn up the cluster
 ```
 export KUBERNETES_PROVIDER=aws
 cluster/kube-up.sh
@@ -28,4 +35,4 @@ cluster/kube-down.sh
 ```
 
 ### Cloud Formation
-There is a contributed example from [CoreOS](http://www.coreos.com) using Cloud Formation.
+There is a contributed [example](aws-coreos.md) from [CoreOS](http://www.coreos.com) using Cloud Formation.