From c483c13aee4eab664b2a5251d291535bdf21bd61 Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Mon, 4 Sep 2017 12:19:36 +0200
Subject: [PATCH] Correct logdump logic for kubemark master

---
 cluster/log-dump/log-dump.sh     |  2 ++
 test/kubemark/master-log-dump.sh | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh
index 1ad05ebad97..374ac454878 100755
--- a/cluster/log-dump/log-dump.sh
+++ b/cluster/log-dump/log-dump.sh
@@ -176,6 +176,8 @@ function dump_masters() {
   elif [[ ! "${master_ssh_supported_providers}" =~ "${KUBERNETES_PROVIDER}" ]]; then
     echo "Master SSH not supported for ${KUBERNETES_PROVIDER}"
     return
+  elif [[ -n "${KUBEMARK_MASTER_NAME:-}" ]]; then
+    master_names=( "${KUBEMARK_MASTER_NAME}" )
   else
     if ! (detect-master); then
       echo "Master not detected. Is the cluster up?"
diff --git a/test/kubemark/master-log-dump.sh b/test/kubemark/master-log-dump.sh
index fc18541e441..35b04d6d3ff 100755
--- a/test/kubemark/master-log-dump.sh
+++ b/test/kubemark/master-log-dump.sh
@@ -14,15 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export KUBERNETES_PROVIDER="kubemark"
-export KUBE_CONFIG_FILE="config-default.sh"
-
 REPORT_DIR="${1:-_artifacts}"
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 
-source "${KUBE_ROOT}/cluster/kubemark/util.sh"
+source ${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh
+source ${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh
 
-detect-master
+export KUBEMARK_MASTER_NAME="${MASTER_NAME}"
 
-echo "Dumping logs for kubemark master: ${MASTER_NAME}"
+echo "Dumping logs for kubemark master: ${KUBEMARK_MASTER_NAME}"
 DUMP_ONLY_MASTER_LOGS=true ${KUBE_ROOT}/cluster/log-dump/log-dump.sh "${REPORT_DIR}"