Merge pull request #46635 from krzyzacy/copy-files

Automatic merge from submit-queue Switch gcloud compute copy-files to scp gcloud is deprecating `gcloud compute copy-files` and switching to `gcloud compute scp`. Make the change before things start to break. https://cloud.google.com/sdk/gcloud/reference/compute/copy-files Warnings we get: `W0529 10:28:59.097] WARNING: `gcloud compute copy-files` is deprecated. Please use `gcloud compute scp` instead. Note that `gcloud compute scp` does not have recursive copy on by default. To turn on recursion, use the `--recurse` flag.` /cc @jlowdermilk

Merge pull request #46635 from krzyzacy/copy-files
32bce030 · Kubernetes Submit Queue · GitHub · a44bf9fd · d237e54a · 32bce030
Commit 32bce030 authored May 30, 2017 by Kubernetes Submit Queue Committed by GitHub May 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

log-dump.sh cluster/log-dump.sh +1 -1

util.sh test/kubemark/gce/util.sh +1 -1

No files found.
--- a/cluster/log-dump.sh
+++ b/cluster/log-dump.sh
@@ -105,7 +105,7 @@ function copy-logs-from-node() {
        gce|gke|kubemark)
          # get-serial-port-output lets you ask for ports 1-4, but currently (11/21/2016) only port 1 contains useful information
          gcloud compute instances get-serial-port-output --project "${PROJECT}" --zone "${ZONE}" --port 1 "${node}" > "${dir}/serial-1.log" || true
-          gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true
+          gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true
          ;;
        aws)
          local ip=$(get_ssh_hostname "${node}")

--- a/test/kubemark/gce/util.sh
+++ b/test/kubemark/gce/util.sh
@@ -113,7 +113,7 @@ function execute-cmd-on-master-with-retries() {
 }
 function copy-files() {
-	run-gcloud-compute-with-retries copy-files --zone="${ZONE}" --project="${PROJECT}" $@
+	run-gcloud-compute-with-retries scp --recurse --zone="${ZONE}" --project="${PROJECT}" $@
 }
 function delete-master-instance-and-resources {