5df9284ff4
Automatic merge from submit-queue Ubuntu: Enable ssh compression when downloading binaries during cluster creation <!-- Checklist for submitting a Pull Request Please remove this comment block before submitting. 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 3. If you want this PR to automatically close an issue when it is merged, add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>` to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests). 4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. --> resolves #20971 by using the options provided by ssh. Native ssh compression has existed for years, and the server is free to disregard the setting, so this should be safe. With things like the kube binaries I see about a 2x speed increase. ``` λ time scp kubes-bin.tar 9.30.182.251:/mnt/build/kubin kubes-bin.tar 100% 344MB 10.7MB/s 00:32 real 0m32.284s user 0m1.679s sys 0m1.263s λ time scp -C kubes-bin.tar 9.30.182.251:/mnt/build/kubin kubes-bin.tar 100% 344MB 22.9MB/s 00:15 real 0m14.810s user 0m12.858s sys 0m0.994s λ ls -lah kubes-bin.tar -rw-r--r-- 1 mhb staff 344M Jun 2 15:29 kubes-bin.tar λ tar -tf kubes-bin.tar kubectl master/ master/etcd master/etcdctl master/flanneld master/kube-apiserver master/kube-controller-manager master/kube-scheduler node/ node/flanneld node/kube-proxy node/kubelet ```
29 lines
997 B
Bash
29 lines
997 B
Bash
#!/bin/bash
|
|
|
|
# Copyright 2014 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
|
|
|
|
# These need to be set
|
|
#export GOVC_URL=
|
|
#export GOVC_DATACENTER=
|
|
#export GOVC_DATASTORE=
|
|
#export GOVC_NETWORK=
|
|
#export GOVC_GUEST_LOGIN=
|
|
|
|
# Set GOVC_INSECURE if the host in GOVC_URL is using a certificate that cannot
|
|
# be verified (i.e. a self-signed certificate), but IS trusted.
|
|
#export GOVC_INSECURE=1
|