From be2633a0a126b70382e692fab2b43eb6b66cca10 Mon Sep 17 00:00:00 2001
From: Alexander Krassiev <die.kriegsmarine@gmail.com>
Date: Sat, 14 May 2016 11:08:04 -0700
Subject: [PATCH] Fixed 'Invalid endpoint: https://ec2.us-east-.amazonaws.com'.
 #24420 #24020

---
 cluster/aws/util.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index b1afb5fdaf3..5bf2099e0be 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -95,7 +95,12 @@ source "${KUBE_ROOT}/cluster/aws/${OS_DISTRIBUTION}/util.sh"
 load_distro_utils
 
 # This removes the final character in bash (somehow)
-AWS_REGION=${ZONE%?}
+re='[a-zA-Z]'
+if [[ ${ZONE: -1} =~ $re  ]]; then 
+  AWS_REGION=${ZONE%?}
+else 
+  AWS_REGION=$ZONE
+fi
 
 export AWS_DEFAULT_REGION=${AWS_REGION}
 export AWS_DEFAULT_OUTPUT=text