github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-03 16:16:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77793 from SataQiu/fix-golint-client-go-20190513

Browse Source 
Fix golint failures of client-go/tools/auth client-go/tools/portforward

Kubernetes-commit: 5666982b2745e88d2009e4155d4a22f6c01061df
This commit is contained in:
Kubernetes Publisher
2019-05-22 18:44:24 -07:00
parent df931a0dfc 185f79a1f6
commit 79226fe194
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/auth/clientauth.go
View File

@@ -105,7 +105,7 @@ func LoadFromFile(path string) (*Info, error) {
// The fields of client.Config with a corresponding field in the Info are set // The fields of client.Config with a corresponding field in the Info are set
// with the value from the Info. // with the value from the Info.
func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error) { func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error) {
var config restclient.Config = c var config = c
config.Username = info.User config.Username = info.User
config.Password = info.Password config.Password = info.Password
config.CAFile = info.CAFile config.CAFile = info.CAFile
@@ -118,6 +118,7 @@ func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error)
return config, nil return config, nil
} }
// Complete returns true if the Kubernetes API authorization info is complete.
func (info Info) Complete() bool { func (info Info) Complete() bool {
return len(info.User) > 0 || return len(info.User) > 0 ||
len(info.CertFile) > 0 || len(info.CertFile) > 0 ||

3
tools/portforward/portforward.go
View File

@@ -33,8 +33,8 @@ import (
"k8s.io/apimachinery/pkg/util/runtime" "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 // 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" const PortForwardProtocolV1Name = "portforward.k8s.io"
// PortForwarder knows how to listen for local connections and forward them to // 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() { func (pf *PortForwarder) Close() {
// stop all listeners // stop all listeners
for _, l := range pf.listeners { for _, l := range pf.listeners {