Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
cc199c74
Commit
cc199c74
authored
Apr 13, 2019
by
SataQiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix golint failures of cmd/kube-proxy/app
parent
ed2bdd53
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
server.go
cmd/kube-proxy/app/server.go
+6
-3
server_windows.go
cmd/kube-proxy/app/server_windows.go
+1
-0
.golint_failures
hack/.golint_failures
+0
-1
No files found.
cmd/kube-proxy/app/server.go
View file @
cc199c74
...
...
@@ -196,6 +196,7 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
"Options are:
\n
"
+
strings
.
Join
(
utilfeature
.
DefaultFeatureGate
.
KnownFeatures
(),
"
\n
"
))
}
// NewOptions returns initialized Options
func
NewOptions
()
*
Options
{
return
&
Options
{
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.
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
}
else
{
o
.
config
=
c
}
o
.
config
=
c
if
err
:=
o
.
initWatcher
();
err
!=
nil
{
return
err
...
...
@@ -295,6 +296,7 @@ func (o *Options) Validate(args []string) error {
return
nil
}
// Run runs the specified ProxyServer.
func
(
o
*
Options
)
Run
()
error
{
defer
close
(
o
.
errCh
)
if
len
(
o
.
WriteConfigTo
)
>
0
{
...
...
@@ -415,6 +417,7 @@ func (o *Options) loadConfig(data []byte) (*kubeproxyconfig.KubeProxyConfigurati
return
proxyConfig
,
nil
}
// ApplyDefaults applies the default values to Options.
func
(
o
*
Options
)
ApplyDefaults
(
in
*
kubeproxyconfig
.
KubeProxyConfiguration
)
(
*
kubeproxyconfig
.
KubeProxyConfiguration
,
error
)
{
external
,
err
:=
o
.
scheme
.
ConvertToVersion
(
in
,
v1alpha1
.
SchemeGroupVersion
)
if
err
!=
nil
{
...
...
cmd/kube-proxy/app/server_windows.go
View file @
cc199c74
...
...
@@ -24,6 +24,7 @@ import (
"errors"
"fmt"
"net"
// Enable pprof HTTP handlers.
_
"net/http/pprof"
"k8s.io/api/core/v1"
...
...
hack/.golint_failures
View file @
cc199c74
cmd/cloud-controller-manager/app/apis/config/v1alpha1
cmd/kube-apiserver/app
cmd/kube-controller-manager/app
cmd/kube-proxy/app
cmd/kubeadm/app/apis/kubeadm/v1beta1
pkg/apis/abac/latest
pkg/apis/admission
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment