diff --git a/glide.lock b/glide.lock index 52380e0f9..d154ab7f5 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 998d87445fec0bd715fa5ccbcc227cb4997e56ceff58dc8eb53ea2e0cc84abfd -updated: 2016-04-27T16:11:47.531200165-06:00 +hash: 43d0eadd3ed4b3563b4a6a49d3bd6d083bcb8fbe9d201dfef763b90c1677738c +updated: 2016-05-09T10:30:30.592692551-07:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c @@ -51,6 +51,10 @@ imports: - tlsconfig - name: github.com/docker/go-units version: 0bbddae09c5a5419a8c6dcdd7ff90da3d450393b +- name: github.com/docker/spdystream + version: 449fdfce4d962303d702fec724ef0ad181c92528 + subpackages: + - spdy - name: github.com/emicklei/go-restful version: 496d495156da218b9912f03dfa7df7f80fbd8cc3 subpackages: @@ -168,7 +172,7 @@ imports: - name: github.com/prometheus/procfs version: 490cc6eb5fa45bf8a8b7b73c8bc82a8160e8531d - name: github.com/spf13/cobra - version: e14e47b7a916ed178f4559ebd7e625cf16410181 + version: 0f866a6211e33cde2091d9290c08f6afd6c9ebbc subpackages: - cobra - name: github.com/spf13/pflag @@ -187,6 +191,7 @@ imports: - trace - http2/hpack - internal/timeseries + - websocket - context/ctxhttp - name: golang.org/x/oauth2 version: b5adcc2dcdf009d0391547edc6ecbaff889f5bb9 @@ -232,110 +237,121 @@ imports: - name: k8s.io/kubernetes version: 95f2ca2ff65a03342746a2a49b8f360428dd94a2 subpackages: + - pkg/api + - pkg/client/restclient + - pkg/client/unversioned - pkg/client/unversioned/clientcmd + - pkg/client/unversioned/portforward + - pkg/client/unversioned/remotecommand - pkg/kubectl/cmd/util - pkg/kubectl/resource - - pkg/api - - pkg/api/unversioned - - pkg/client/restclient - - pkg/client/unversioned/auth - - pkg/client/unversioned/clientcmd/api - - pkg/client/unversioned/clientcmd/api/latest - - pkg/runtime - - pkg/util/errors - - pkg/util/homedir - - pkg/util/validation - - pkg/api/errors - pkg/api/meta - - pkg/api/validation - - pkg/apimachinery - - pkg/apimachinery/registered - - pkg/apis/apps - - pkg/apis/autoscaling - - pkg/apis/batch - - pkg/apis/extensions - - pkg/apis/metrics - - pkg/client/typed/discovery - - pkg/client/unversioned - - pkg/client/unversioned/adapters/internalclientset - - pkg/kubectl - - pkg/labels - - pkg/registry/thirdpartyresourcedata - - pkg/runtime/serializer/json - - pkg/util/flag - - pkg/util/strategicpatch - - pkg/util/sets - - pkg/util/yaml - - pkg/watch - pkg/api/resource + - pkg/api/unversioned - pkg/auth/user - pkg/conversion - pkg/fields + - pkg/labels + - pkg/runtime - pkg/runtime/serializer - pkg/types - pkg/util - pkg/util/intstr - pkg/util/rand + - pkg/util/sets + - 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/clientcmd/api/v1 - - pkg/runtime/serializer/versioning - - pkg/conversion/queryparams - - pkg/util/json - - pkg/util/validation/field - - pkg/api/endpoints - - pkg/api/pod - - pkg/api/service - - pkg/api/util - - pkg/capabilities - pkg/api/install + - pkg/apimachinery/registered + - pkg/apis/apps - pkg/apis/apps/install - pkg/apis/authorization/install + - pkg/apis/autoscaling - pkg/apis/autoscaling/install + - pkg/apis/batch - pkg/apis/batch/install - pkg/apis/componentconfig/install + - pkg/apis/extensions - pkg/apis/extensions/install - pkg/apis/metrics/install + - pkg/client/typed/discovery - pkg/util/wait - plugin/pkg/client/auth + - pkg/client/unversioned/auth + - pkg/client/unversioned/clientcmd/api/latest + - pkg/util/errors + - pkg/util/homedir + - pkg/util/validation + - pkg/kubelet/server/portforward + - pkg/util/httpstream + - pkg/util/runtime + - pkg/kubelet/server/remotecommand + - pkg/util/httpstream/spdy + - pkg/apimachinery + - pkg/apis/metrics + - pkg/client/unversioned/adapters/internalclientset + - pkg/kubectl + - pkg/registry/thirdpartyresourcedata + - pkg/runtime/serializer/json + - pkg/util/flag + - pkg/util/strategicpatch + - pkg/util/yaml + - third_party/forked/reflect + - pkg/conversion/queryparams + - pkg/util/json + - pkg/runtime/serializer/protobuf + - pkg/runtime/serializer/recognizer + - pkg/runtime/serializer/versioning + - pkg/util/validation/field + - pkg/util/parsers + - pkg/watch/versioned + - pkg/api/endpoints + - pkg/api/pod + - pkg/api/service + - pkg/api/util + - pkg/capabilities + - pkg/util/integer + - pkg/apis/apps/v1alpha1 + - pkg/apis/authorization + - pkg/apis/authorization/v1beta1 + - pkg/apis/autoscaling/v1 + - pkg/apis/batch/v1 + - pkg/apis/componentconfig + - pkg/apis/componentconfig/v1alpha1 + - pkg/apis/extensions/v1beta1 + - pkg/apis/metrics/v1alpha1 + - plugin/pkg/client/auth/gcp + - pkg/client/unversioned/clientcmd/api/v1 + - pkg/httplog + - pkg/util/wsstream + - third_party/golang/netutil - pkg/client/clientset_generated/internalclientset - pkg/client/clientset_generated/internalclientset/typed/core/unversioned - pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned - - pkg/apis/batch/v1 - pkg/credentialprovider - pkg/fieldpath - pkg/kubelet/qos/util - pkg/util/deployment - - pkg/util/integer - pkg/util/jsonpath - pkg/api/rest - - pkg/apis/extensions/v1beta1 - pkg/apis/extensions/validation - pkg/registry/generic - pkg/util/framer - third_party/forked/json - - pkg/util/runtime - - third_party/forked/reflect - - pkg/runtime/serializer/protobuf - - pkg/runtime/serializer/recognizer - - pkg/util/parsers - - pkg/watch/versioned - pkg/util/hash - pkg/util/net/sets - - pkg/apis/apps/v1alpha1 - - pkg/apis/authorization - - pkg/apis/authorization/v1beta1 - - pkg/apis/autoscaling/v1 - - pkg/apis/componentconfig - - pkg/apis/componentconfig/v1alpha1 - - pkg/apis/metrics/v1alpha1 - - plugin/pkg/client/auth/gcp + - pkg/kubelet/qos + - pkg/master/ports - pkg/client/clientset_generated/internalclientset/typed/batch/unversioned - pkg/controller - pkg/util/labels @@ -344,8 +360,6 @@ imports: - pkg/api/unversioned/validation - pkg/controller/podautoscaler - pkg/storage - - pkg/kubelet/qos - - pkg/master/ports - pkg/client/cache - pkg/client/record - pkg/controller/framework diff --git a/glide.yaml b/glide.yaml index 670332665..84cd74614 100644 --- a/glide.yaml +++ b/glide.yaml @@ -26,7 +26,12 @@ import: - package: k8s.io/kubernetes version: ^1.2 subpackages: + - pkg/api + - pkg/client/restclient + - pkg/client/unversioned - pkg/client/unversioned/clientcmd + - pkg/client/unversioned/portforward + - pkg/client/unversioned/remotecommand - pkg/kubectl/cmd/util - pkg/kubectl/resource - package: github.com/gosuri/uitable diff --git a/pkg/kube/tunnel.go b/pkg/kube/tunnel.go index 508a63892..57325380f 100644 --- a/pkg/kube/tunnel.go +++ b/pkg/kube/tunnel.go @@ -3,8 +3,11 @@ package kube import ( "fmt" "net/url" + "os" + "os/signal" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/portforward" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand"