From c73a47f5995f358a136875f73765a21f8b9cf9cf Mon Sep 17 00:00:00 2001
From: Martin Westergaard Lassen <martin@mwl.dk>
Date: Fri, 5 Aug 2016 22:00:34 +0100
Subject: [PATCH] Added INSTANCE_PREFIX to S3 project hash to avoid url clashes
 between clusters in same EC2 region

---
 cluster/aws/util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 9509e3c637b..d9a2fe5ae46 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -606,9 +606,9 @@ function upload-server-tars() {
       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} ${INSTANCE_PREFIX}")
       else
-        project_hash=$(echo -n "${USER} ${key}" | md5sum | awk '{ print $1 }')
+        project_hash=$(echo -n "${USER} ${key} ${INSTANCE_PREFIX}" | md5sum | awk '{ print $1 }')
       fi
       AWS_S3_BUCKET="kubernetes-staging-${project_hash}"
   fi