github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25619 from skrassiev/bug/aws_invalid_endpoint_24020

Browse Source 
Automatic merge from submit-queue

Fixed 'Invalid endpoint: https://ec2.us-east-.amazonaws.com'. #24420 #24420

Addresses:

- https://github.com/kubernetes/kubernetes/issues/24020

- https://github.com/kubernetes/kubernetes/issues/24420
This commit is contained in:
k8s-merge-robot 2016-05-16 00:04:04 -07:00
commit 1cba05574b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/aws/util.sh
View File

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