github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

<!-- Reviewable:start -->
---
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)
<!-- Reviewable:end -->
pull/6/head
Kubernetes Submit Queue 2016-08-12 02:40:38 -07:00 committed by GitHub
parent 5c1e1573d2 4fd7578552
commit 90ceeb3219
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/log-dump.sh
View File

@ -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