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

AWS: Fix e2e usage of find-tagged-master-ip

Browse Source 
In the e2e tests detect-master is called directly.  In turn, it calls
find-tagged-master-ip, which assumed that find-master-pd has already already
been called.  But this wasn't true in the e2e case.

We add a call to find-master-pd; it is idempotent.
This commit is contained in:
Justin Santa Barbara 2016-02-01 22:42:50 +00:00
parent ff386b7a58
commit 0f6b3611d8
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

@ -160,6 +160,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
@ -175,6 +176,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}