github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34647 from zmerlynn/fix-kubemark-log-copy

Browse Source 
Automatic merge from submit-queue

log-dump.sh: Fix kubemark log-dump.sh

**What this PR does / why we need it**: Using `log-dump.sh` with the `kubemark` synthetic provider are broken.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #34446
This commit is contained in:
Kubernetes Submit Queue 2016-10-12 18:25:05 -07:00 committed by GitHub
commit a3603c9d43
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/log-dump.sh
View File

@ -96,7 +96,7 @@ function copy-logs-from-node() {
scp -oLogLevel=quiet -oConnectTimeout=30 -oStrictHostKeyChecking=no -i "${LOG_DUMP_SSH_KEY}" "${LOG_DUMP_SSH_USER}@${node}:${scp_files}" "${dir}" > /dev/null || true
else
case "${KUBERNETES_PROVIDER}" in
gce|gke)
gce|gke|kubemark)
gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true
;;
aws)
@ -120,7 +120,7 @@ function save-logs() {
fi
else
case "${KUBERNETES_PROVIDER}" in
gce|gke)
gce|gke|kubemark)
files="${files} ${gce_logfiles}"
;;
aws)