Merge pull request #30472 from spiffxp/cluster-log-dump-aws

Automatic merge from submit-queue cluster/log-dump scp shouldn't check host keys for aws parity with cluster/aws/util.sh:ssh-to-node  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30472)

Merge pull request #30472 from spiffxp/cluster-log-dump-aws
90ceeb32 · Kubernetes Submit Queue · GitHub · 5c1e1573 · 4fd75785 · 90ceeb32
Commit 90ceeb32 authored Aug 12, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/cluster/log-dump.sh
+++ b/cluster/log-dump.sh
@@ -46,7 +46,7 @@ function copy-logs-from-node() {

    if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
        local ip=$(get_ssh_hostname "${node}")
-        scp -i "${AWS_SSH_KEY}" "${SSH_USER}@${ip}:${scp_files}" "${dir}" > /dev/null || true
+        scp -oLogLevel=quiet -oConnectTimeout=30 -oStrictHostKeyChecking=no -i "${AWS_SSH_KEY}" "${SSH_USER}@${ip}:${scp_files}" "${dir}" > /dev/null || true
    else
        gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true
    fi