github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76497 from SataQiu/fix-golint-20190413

Browse Source 
Fix golint failures of cmd/kube-proxy/app
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 10:26:53 -07:00 committed by GitHub
commit 631bf8cbc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kube-proxy/app/server.go
View File

@ -196,6 +196,7 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
"Options are:\n"+strings.Join(utilfeature.DefaultFeatureGate.KnownFeatures(), "\n")) "Options are:\n"+strings.Join(utilfeature.DefaultFeatureGate.KnownFeatures(), "\n"))
} }
// NewOptions returns initialized Options
func NewOptions() *Options { func NewOptions() *Options {
return &Options{ return &Options{
config: new(kubeproxyconfig.KubeProxyConfiguration), config: new(kubeproxyconfig.KubeProxyConfiguration),
@ -218,11 +219,11 @@ func (o *Options) Complete() error {
// Load the config file here in Complete, so that Validate validates the fully-resolved config. // Load the config file here in Complete, so that Validate validates the fully-resolved config.
if len(o.ConfigFile) > 0 { if len(o.ConfigFile) > 0 {
if c, err := o.loadConfigFromFile(o.ConfigFile); err != nil { c, err := o.loadConfigFromFile(o.ConfigFile)
if err != nil {
return err return err
} else {
o.config = c
} }
o.config = c
if err := o.initWatcher(); err != nil { if err := o.initWatcher(); err != nil {
return err return err
@ -295,6 +296,7 @@ func (o *Options) Validate(args []string) error {
return nil return nil
} }
// Run runs the specified ProxyServer.
func (o *Options) Run() error { func (o *Options) Run() error {
defer close(o.errCh) defer close(o.errCh)
if len(o.WriteConfigTo) > 0 { if len(o.WriteConfigTo) > 0 {
@ -415,6 +417,7 @@ func (o *Options) loadConfig(data []byte) (*kubeproxyconfig.KubeProxyConfigurati
return proxyConfig, nil return proxyConfig, nil
} }
// ApplyDefaults applies the default values to Options.
func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*kubeproxyconfig.KubeProxyConfiguration, error) { func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*kubeproxyconfig.KubeProxyConfiguration, error) {
external, err := o.scheme.ConvertToVersion(in, v1alpha1.SchemeGroupVersion) external, err := o.scheme.ConvertToVersion(in, v1alpha1.SchemeGroupVersion)
if err != nil { if err != nil {

1
cmd/kube-proxy/app/server_windows.go
View File

@ -24,6 +24,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net" "net"
// Enable pprof HTTP handlers.
_ "net/http/pprof" _ "net/http/pprof"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"

1
hack/.golint_failures
View File

@ -1,7 +1,6 @@
cmd/cloud-controller-manager/app/apis/config/v1alpha1 cmd/cloud-controller-manager/app/apis/config/v1alpha1
cmd/kube-apiserver/app cmd/kube-apiserver/app
cmd/kube-controller-manager/app cmd/kube-controller-manager/app
cmd/kube-proxy/app
cmd/kubeadm/app/apis/kubeadm/v1beta1 cmd/kubeadm/app/apis/kubeadm/v1beta1
pkg/apis/abac/latest pkg/apis/abac/latest
pkg/apis/admission pkg/apis/admission