Skip to content

Commit 5666982

Browse files
authored
Merge pull request kubernetes#77793 from SataQiu/fix-golint-client-go-20190513
Fix golint failures of client-go/tools/auth client-go/tools/portforward
2 parents 25b0d2d + a89d75e commit 5666982

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

hack/.golint_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ staging/src/k8s.io/client-go/scale/scheme/autoscalingv1
537537
staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1
538538
staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1
539539
staging/src/k8s.io/client-go/testing
540-
staging/src/k8s.io/client-go/tools/auth
541540
staging/src/k8s.io/client-go/tools/cache
542541
staging/src/k8s.io/client-go/tools/cache/testing
543542
staging/src/k8s.io/client-go/tools/clientcmd
@@ -546,7 +545,6 @@ staging/src/k8s.io/client-go/tools/clientcmd/api/latest
546545
staging/src/k8s.io/client-go/tools/clientcmd/api/v1
547546
staging/src/k8s.io/client-go/tools/leaderelection
548547
staging/src/k8s.io/client-go/tools/leaderelection/resourcelock
549-
staging/src/k8s.io/client-go/tools/portforward
550548
staging/src/k8s.io/client-go/tools/record
551549
staging/src/k8s.io/client-go/tools/reference
552550
staging/src/k8s.io/client-go/transport

staging/src/k8s.io/client-go/tools/auth/clientauth.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func LoadFromFile(path string) (*Info, error) {
105105
// The fields of client.Config with a corresponding field in the Info are set
106106
// with the value from the Info.
107107
func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error) {
108-
var config restclient.Config = c
108+
var config = c
109109
config.Username = info.User
110110
config.Password = info.Password
111111
config.CAFile = info.CAFile
@@ -118,6 +118,7 @@ func (info Info) MergeWithConfig(c restclient.Config) (restclient.Config, error)
118118
return config, nil
119119
}
120120

121+
// Complete returns true if the Kubernetes API authorization info is complete.
121122
func (info Info) Complete() bool {
122123
return len(info.User) > 0 ||
123124
len(info.CertFile) > 0 ||

staging/src/k8s.io/client-go/tools/portforward/portforward.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"k8s.io/apimachinery/pkg/util/runtime"
3434
)
3535

36+
// PortForwardProtocolV1Name is the subprotocol used for port forwarding.
3637
// TODO move to API machinery and re-unify with kubelet/server/portfoward
37-
// The subprotocol "portforward.k8s.io" is used for port forwarding.
3838
const PortForwardProtocolV1Name = "portforward.k8s.io"
3939

4040
// 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) {
401401
}
402402
}
403403

404+
// Close stops all listeners of PortForwarder.
404405
func (pf *PortForwarder) Close() {
405406
// stop all listeners
406407
for _, l := range pf.listeners {

0 commit comments

Comments
 (0)