From bebed306542ebbbaadb51e57cd9ef45b8583ac0d Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Wed, 18 May 2016 12:16:21 -0700 Subject: [PATCH] fix(tunnel): silent output of tunnel connection --- glide.lock | 131 ++++++++++++++++++++++++++++++--------------- glide.yaml | 2 +- pkg/kube/tunnel.go | 4 +- 3 files changed, 92 insertions(+), 45 deletions(-) diff --git a/glide.lock b/glide.lock index 64ad38803..820093d2c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 63afc29bc3d5032c6c2829b7bf9ffba43555ad5a3faf72a14ef2a86155c0514c -updated: 2016-05-11T14:15:54.42108644-07:00 +hash: e9e7997dec0e958daebef48f6fac925d75e4855a48351b8d8c428aa1f7826345 +updated: 2016-05-18T12:12:37.896622998-07:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -18,7 +18,7 @@ imports: subpackages: - spew - name: github.com/docker/distribution - version: 55f1b7651f6242617133312ff8af5c2e4e3628ea + version: cd27f179f2c10c5d300e6d09025b538c475b0d51 subpackages: - digest - reference @@ -30,19 +30,25 @@ imports: - pkg/stdcopy - pkg/symlink - pkg/term + - pkg/term/winconsole - pkg/timeutils - pkg/units - name: github.com/docker/engine-api - version: 26cdffeca716ae4df98070051a852b3198d7d153 + version: 3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2 subpackages: - client + - client/transport + - client/transport/cancellable - types + - types/blkiodev - types/container - types/filters - types/network + - types/reference - types/registry - - types/blkiodev - types/strslice + - types/time + - types/versions - name: github.com/docker/go-connections version: f549a9393d05688dff0992ef3efd8bbe6c628aeb subpackages: @@ -58,8 +64,8 @@ imports: - name: github.com/emicklei/go-restful version: 496d495156da218b9912f03dfa7df7f80fbd8cc3 subpackages: - - swagger - log + - swagger - name: github.com/evanphx/json-patch version: 7dd4489c2eb6073e5a9d7746c3274c5b5f0387df - name: github.com/ghodss/yaml @@ -90,6 +96,7 @@ imports: - protoc-gen-gogo/plugin - sortkeys - vanity + - vanity/command - name: github.com/golang/glog version: 44145f04b68cf362d9c4df2182967c2275eaefed - name: github.com/golang/groupcache @@ -103,24 +110,40 @@ imports: - ptypes/any - ptypes/timestamp - name: github.com/google/cadvisor - version: 546a3771589bdb356777c646c6eca24914fdd48b + version: 750f18e5eac3f6193b354fc14c03d92d4318a0ec subpackages: - api - cache/memory - collector - container + - container/common + - container/docker + - container/libcontainer + - container/raw + - container/rkt + - container/systemd - events - fs - healthz - http + - http/mux - info/v1 + - info/v1/test - info/v2 - manager - metrics - pages + - pages/static - storage - summary - utils + - utils/cloudinfo + - utils/cpuload + - utils/cpuload/netlink + - utils/machine + - utils/oomparser + - utils/sysfs + - utils/sysinfo - validate - version - name: github.com/google/gofuzz @@ -150,10 +173,20 @@ imports: version: 7ca2aa4873aea7cb4265b1726acb24b90d8726c6 subpackages: - libcontainer + - libcontainer/apparmor + - libcontainer/cgroups - libcontainer/cgroups/fs + - libcontainer/cgroups/systemd - libcontainer/configs - - libcontainer/cgroups + - libcontainer/configs/validate + - libcontainer/criurpc + - libcontainer/label + - libcontainer/seccomp + - libcontainer/selinux + - libcontainer/stacktrace - libcontainer/system + - libcontainer/user + - libcontainer/utils - name: github.com/pborman/uuid version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 - name: github.com/prometheus/client_golang @@ -183,6 +216,7 @@ imports: version: f4485b318aadd133842532f841dc205a8e339d74 subpackages: - codec + - codec/codecgen - name: golang.org/x/net version: fb93926129b8ec0056f2f458b1f519654814edf0 subpackages: @@ -198,8 +232,8 @@ imports: subpackages: - google - internal - - jwt - jws + - jwt - name: google.golang.org/appengine version: 12d5545dc1cfa6047a286d5e853841b6471f4c19 subpackages: @@ -228,14 +262,12 @@ imports: - naming - transport - peer +- name: gopkg.in/inf.v0 + version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 - name: gopkg.in/yaml.v2 version: a83829b6f1293c91addabc89d0571c246397bbf4 -- name: k8s.io/heapster - version: 0991ac528ea24aae194e45d6dcf01896cb42cbea - subpackages: - - api/v1/types - name: k8s.io/kubernetes - version: 95f2ca2ff65a03342746a2a49b8f360428dd94a2 + version: 3a5d53d4679df921a6f79d20b69f4982953493f5 subpackages: - pkg/api - pkg/client/restclient @@ -247,6 +279,7 @@ imports: - pkg/kubectl/resource - pkg/labels - pkg/api/meta + - pkg/api/meta/metatypes - pkg/api/resource - pkg/api/unversioned - pkg/auth/user @@ -260,27 +293,21 @@ imports: - pkg/util/rand - pkg/util/sets - pkg/util/validation - - pkg/api/errors - - pkg/api/v1 - - pkg/api/validation - - pkg/client/metrics - - pkg/client/transport - - pkg/client/unversioned/clientcmd/api - - pkg/util/crypto - - pkg/util/flowcontrol - - pkg/util/net - - pkg/version - - pkg/watch - - pkg/watch/json - pkg/client/unversioned/auth + - pkg/client/unversioned/clientcmd/api - pkg/client/unversioned/clientcmd/api/latest - pkg/util/errors - pkg/util/homedir - pkg/kubelet/server/portforward - pkg/util/httpstream - pkg/util/runtime + - pkg/client/transport - pkg/kubelet/server/remotecommand - pkg/util/httpstream/spdy + - federation/apis/federation + - federation/client/clientset_generated/federation_internalclientset + - pkg/api/errors + - pkg/api/validation - pkg/apimachinery - pkg/apimachinery/registered - pkg/apis/apps @@ -288,13 +315,16 @@ imports: - pkg/apis/batch - pkg/apis/extensions - pkg/apis/metrics + - pkg/apis/policy - pkg/client/typed/discovery - pkg/client/unversioned/adapters/internalclientset + - pkg/controller - pkg/kubectl - pkg/registry/thirdpartyresourcedata - pkg/runtime/serializer/json - pkg/util/flag - pkg/util/strategicpatch + - pkg/watch - pkg/util/yaml - third_party/forked/reflect - pkg/conversion/queryparams @@ -303,31 +333,49 @@ imports: - pkg/runtime/serializer/recognizer - pkg/runtime/serializer/versioning - pkg/util/wait - - pkg/util/validation/field - - pkg/util/parsers + - pkg/api/v1 + - pkg/client/metrics + - pkg/runtime/serializer/streaming + - pkg/util/crypto + - pkg/util/flowcontrol + - pkg/util/net + - pkg/version - pkg/watch/versioned + - pkg/client/unversioned/clientcmd/api/v1 + - pkg/httplog + - pkg/util/wsstream + - third_party/golang/netutil + - federation/apis/federation/install + - federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned + - federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned + - pkg/util/validation/field - pkg/api/endpoints - pkg/api/pod - pkg/api/service + - pkg/api/unversioned/validation - pkg/api/util - pkg/capabilities - - pkg/util/integer - - pkg/client/unversioned/clientcmd/api/v1 - - pkg/httplog - - pkg/util/wsstream - - third_party/golang/netutil - pkg/api/install - pkg/apis/apps/install + - pkg/apis/authentication.k8s.io/install - pkg/apis/authorization/install - pkg/apis/autoscaling/install - pkg/apis/batch/install + - pkg/apis/batch/v2alpha1 - pkg/apis/componentconfig/install - pkg/apis/extensions/install - pkg/apis/metrics/install + - pkg/apis/policy/install - plugin/pkg/client/auth - pkg/client/clientset_generated/internalclientset - pkg/client/clientset_generated/internalclientset/typed/core/unversioned - pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned + - pkg/client/cache + - pkg/client/record + - pkg/controller/framework + - pkg/util/hash + - pkg/util/integer + - pkg/api/annotations - pkg/apis/batch/v1 - pkg/credentialprovider - pkg/fieldpath @@ -340,30 +388,27 @@ imports: - pkg/registry/generic - pkg/util/framer - third_party/forked/json - - pkg/util/hash + - pkg/util/parsers + - federation/apis/federation/v1alpha1 - pkg/util/net/sets - pkg/apis/apps/v1alpha1 + - pkg/apis/authentication.k8s.io + - pkg/apis/authentication.k8s.io/v1beta1 - pkg/apis/authorization - pkg/apis/authorization/v1beta1 - pkg/apis/autoscaling/v1 - pkg/apis/componentconfig - pkg/apis/componentconfig/v1alpha1 - pkg/apis/metrics/v1alpha1 + - pkg/apis/policy/v1alpha1 - plugin/pkg/client/auth/gcp + - pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned - pkg/client/clientset_generated/internalclientset/typed/batch/unversioned - - pkg/controller - pkg/util/labels - pkg/util/pod - third_party/golang/template - - pkg/api/unversioned/validation - - pkg/controller/podautoscaler + - pkg/security/podsecuritypolicy/util - pkg/storage - pkg/kubelet/qos - pkg/master/ports - - pkg/client/cache - - pkg/client/record - - pkg/controller/framework - - pkg/controller/podautoscaler/metrics -- name: speter.net/go/exp/math/dec/inf - version: 42ca6cd68aa922bc3f32f1e056e61b65945d9ad7 devImports: [] diff --git a/glide.yaml b/glide.yaml index acc571a02..3b3439ca1 100644 --- a/glide.yaml +++ b/glide.yaml @@ -24,7 +24,7 @@ import: - package: google.golang.org/grpc version: dec33edc378cf4971a2741cfd86ed70a644d6ba3 - package: k8s.io/kubernetes - version: ^1.2 + version: 3a5d53d4679df921a6f79d20b69f4982953493f5 subpackages: - pkg/api - pkg/client/restclient diff --git a/pkg/kube/tunnel.go b/pkg/kube/tunnel.go index db858cc25..9b8e143d1 100644 --- a/pkg/kube/tunnel.go +++ b/pkg/kube/tunnel.go @@ -1,6 +1,7 @@ package kube import ( + "bytes" "fmt" "net" "strconv" @@ -57,7 +58,8 @@ func (c *Client) ForwardPort(namespace, podName string, remote int) (*Tunnel, er ports := []string{fmt.Sprintf("%d:%d", local, remote)} - pf, err := portforward.New(dialer, ports, t.stopChan) + var b bytes.Buffer + pf, err := portforward.New(dialer, ports, t.stopChan, &b, &b) if err != nil { return nil, err }