github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20448 from justinsb/aws_fix_e2e_detect_master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-04 16:24:20 -08:00
commit 5b046cccdb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/util.sh
View File

@ -163,6 +163,7 @@ function get_security_group_id {
# Finds the master ip, if it is saved (tagged on the master disk) # Finds the master ip, if it is saved (tagged on the master disk)
# Sets KUBE_MASTER_IP # Sets KUBE_MASTER_IP
function find-tagged-master-ip { function find-tagged-master-ip {
find-master-pd
if [[ -n "${MASTER_DISK_ID:-}" ]]; then if [[ -n "${MASTER_DISK_ID:-}" ]]; then
KUBE_MASTER_IP=$(get-tag ${MASTER_DISK_ID} ${TAG_KEY_MASTER_IP}) KUBE_MASTER_IP=$(get-tag ${MASTER_DISK_ID} ${TAG_KEY_MASTER_IP})
fi fi
@ -178,6 +179,7 @@ function get-tag {
} }
# Gets an existing master, exiting if not found # Gets an existing master, exiting if not found
# Note that this is called directly by the e2e tests
function detect-master() { function detect-master() {
find-tagged-master-ip find-tagged-master-ip
KUBE_MASTER=${MASTER_NAME} KUBE_MASTER=${MASTER_NAME}