From e3e6c8377f141ac5ba82c6dc8577db65ffbc2e2d Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Thu, 12 Mar 2015 10:55:43 -0400
Subject: [PATCH] Allow the S3 bucket name to be specified via AWS_S3_BUCKET

---
 cluster/aws/config-default.sh |  4 ++++
 cluster/aws/util.sh           | 28 +++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
index 98c90f4a06a5c..58a28ff83d214 100644
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -20,6 +20,10 @@ MASTER_SIZE=${MASTER_SIZE:-t2.micro}
 MINION_SIZE=${MINION_SIZE:-t2.micro}
 NUM_MINIONS=${NUM_MINIONS:-4}
 
+# Optional: Set AWS_S3_BUCKET to the name of an S3 bucket to use for uploading binaries
+# (otherwise a unique bucket name will be generated for you)
+#  AWS_S3_BUCKET=kubernetes-artifacts
+
 INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}"
 AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
 IAM_PROFILE="kubernetes"
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 0ff974cfd6a17..8db8dae6d61c4 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -212,30 +212,32 @@ function upload-server-tars() {
   SERVER_BINARY_TAR_URL=
   SALT_TAR_URL=
 
-  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}")
-  else
-    project_hash=$(echo -n "${USER} ${key}" | md5sum | awk '{ print $1 }')
+  if [[ -z ${AWS_S3_BUCKET-} ]]; then
+      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}")
+      else
+        project_hash=$(echo -n "${USER} ${key}" | md5sum | awk '{ print $1 }')
+      fi
+      AWS_S3_BUCKET="kubernetes-staging-${project_hash}"
   fi
-  local -r staging_bucket="kubernetes-staging-${project_hash}"
 
   echo "Uploading to Amazon S3"
-  if ! aws s3 ls "s3://${staging_bucket}" > /dev/null 2>&1 ; then
-    echo "Creating ${staging_bucket}"
-    aws s3 mb "s3://${staging_bucket}"
+  if ! aws s3 ls "s3://${AWS_S3_BUCKET}" > /dev/null 2>&1 ; then
+    echo "Creating ${AWS_S3_BUCKET}"
+    aws s3 mb "s3://${AWS_S3_BUCKET}"
   fi
 
-  local -r staging_path="${staging_bucket}/devel"
+  local -r staging_path="${AWS_S3_BUCKET}/devel"
 
   echo "+++ Staging server tars to S3 Storage: ${staging_path}"
   SERVER_BINARY_TAR_URL="${staging_path}/${SERVER_BINARY_TAR##*/}"
   aws s3 cp "${SERVER_BINARY_TAR}" "s3://${SERVER_BINARY_TAR_URL}"
-  aws s3api put-object-acl --bucket ${staging_bucket} --key "devel/${SERVER_BINARY_TAR##*/}" --grant-read 'uri="http://acs.amazonaws.com/groups/global/AllUsers"'
+  aws s3api put-object-acl --bucket ${AWS_S3_BUCKET} --key "devel/${SERVER_BINARY_TAR##*/}" --grant-read 'uri="http://acs.amazonaws.com/groups/global/AllUsers"'
   SALT_TAR_URL="${staging_path}/${SALT_TAR##*/}"
   aws s3 cp "${SALT_TAR}" "s3://${SALT_TAR_URL}"
-  aws s3api put-object-acl --bucket ${staging_bucket} --key "devel/${SALT_TAR##*/}" --grant-read 'uri="http://acs.amazonaws.com/groups/global/AllUsers"'
+  aws s3api put-object-acl --bucket ${AWS_S3_BUCKET} --key "devel/${SALT_TAR##*/}" --grant-read 'uri="http://acs.amazonaws.com/groups/global/AllUsers"'
 }