From 185f79a1f62d4638f3ad8d8227e045dfc8da1390 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Mon, 13 May 2019 11:13:38 +0800 Subject: [PATCH] fix golint failures of client-go/tools/auth client-go/tools/portforward Kubernetes-commit: a89d75e3b822a13377373b0ef1c1969c69c616ec --- tools/auth/clientauth.go | 3 ++- tools/portforward/portforward.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/auth/clientauth.go b/tools/auth/clientauth.go index 20339ab9..c3417267 100644 --- a/tools/auth/clientauth.go +++ b/tools/auth/clientauth.go @@ -105,7 +105,7 @@ func LoadFromFile(path string) (*Info, error) { // The fields of client.Config with a corresponding field in the Info are set // with the value from the Info. func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error) { - var config restclient.Config = c + var config = c config.Username = info.User config.Password = info.Password config.CAFile = info.CAFile @@ -118,6 +118,7 @@ func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error) return config, nil } +// Complete returns true if the Kubernetes API authorization info is complete. func (info Info) Complete() bool { return len(info.User) > 0 || len(info.CertFile) > 0 || diff --git a/tools/portforward/portforward.go b/tools/portforward/portforward.go index a50a9973..4ab72bb4 100644 --- a/tools/portforward/portforward.go +++ b/tools/portforward/portforward.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" ) +// PortForwardProtocolV1Name is the subprotocol used for port forwarding. // TODO move to API machinery and re-unify with kubelet/server/portfoward -// The subprotocol "portforward.k8s.io" is used for port forwarding. const PortForwardProtocolV1Name = "portforward.k8s.io" // PortForwarder knows how to listen for local connections and forward them to @@ -401,6 +401,7 @@ func (pf *PortForwarder) handleConnection(conn net.Conn, port ForwardedPort) { } } +// Close stops all listeners of PortForwarder. func (pf *PortForwarder) Close() { // stop all listeners for _, l := range pf.listeners {