Skip to content

K
k3s
Commit a3603c9d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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
parents eed41cd6 98bcb690
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/log-dump.sh
View file @ a3603c9d
...@@ -96,7 +96,7 @@ function copy-logs-from-node() { ...@@ -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 scp -oLogLevel=quiet -oConnectTimeout=30 -oStrictHostKeyChecking=no -i "${LOG_DUMP_SSH_KEY}" "${LOG_DUMP_SSH_USER}@${node}:${scp_files}" "${dir}" > /dev/null || true
else else
case "${KUBERNETES_PROVIDER}" in case "${KUBERNETES_PROVIDER}" in
gce|gke) gce|gke|kubemark)
gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true
;; ;;
aws) aws)
...@@ -120,7 +120,7 @@ function save-logs() { ...@@ -120,7 +120,7 @@ function save-logs() {
fi fi
else else
case "${KUBERNETES_PROVIDER}" in case "${KUBERNETES_PROVIDER}" in
gce|gke) gce|gke|kubemark)
files="${files} ${gce_logfiles}" files="${files} ${gce_logfiles}"
;; ;;
aws) aws)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment