github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NewProxyServer 

Different OSes need different args.  This is not a great fix, but better
than adding an arg to Windows which doesn't need it.
pull/6/head
Tim Hockin 2017-11-22 14:17:10 -08:00
parent c45820f0c8
commit 79778288de
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ func (o *Options) Run() error {
return o.writeConfigFile() return o.writeConfigFile()
} }
proxyServer, err := NewProxyServer(o.config, o.CleanupAndExit, o.CleanupIPVS, o.scheme, o.master) proxyServer, err := NewProxyServer(o)
if err != nil { if err != nil {
return err return err
} }

12
cmd/kube-proxy/app/server_others.go
View File

@ -54,7 +54,17 @@ import (
) )
// NewProxyServer returns a new ProxyServer. // NewProxyServer returns a new ProxyServer.
func NewProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExit bool, cleanupIPVS bool, scheme *runtime.Scheme, master string) (*ProxyServer, error) { func NewProxyServer(o *Options) (*ProxyServer, error) {
return newProxyServer(o.config, o.CleanupAndExit, o.CleanupIPVS, o.scheme, o.master)
}
func newProxyServer(
config *proxyconfigapi.KubeProxyConfiguration,
cleanupAndExit bool,
cleanupIPVS bool,
scheme *runtime.Scheme,
master string) (*ProxyServer, error) {
if config == nil { if config == nil {
return nil, errors.New("config is required") return nil, errors.New("config is required")
} }

2
cmd/kube-proxy/app/server_test.go
View File

@ -162,7 +162,7 @@ func TestProxyServerWithCleanupAndExit(t *testing.T) {
} }
options.CleanupAndExit = true options.CleanupAndExit = true
proxyserver, err := NewProxyServer(options.config, options.CleanupAndExit, options.CleanupIPVS, options.scheme, options.master) proxyserver, err := NewProxyServer(options)
assert.Nil(t, err, "unexpected error in NewProxyServer, addr: %s", addr) assert.Nil(t, err, "unexpected error in NewProxyServer, addr: %s", addr)
assert.NotNil(t, proxyserver, "nil proxy server obj, addr: %s", addr) assert.NotNil(t, proxyserver, "nil proxy server obj, addr: %s", addr)

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

@ -46,7 +46,11 @@ import (
) )
// NewProxyServer returns a new ProxyServer. // NewProxyServer returns a new ProxyServer.
func NewProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExit bool, scheme *runtime.Scheme, master string) (*ProxyServer, error) { func NewProxyServer(o *Options) (*ProxyServer, error) {
return newProxyServer(o.config, o.CleanupAndExit, o.scheme, o.master)
}
func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExit bool, scheme *runtime.Scheme, master string) (*ProxyServer, error) {
if config == nil { if config == nil {
return nil, errors.New("config is required") return nil, errors.New("config is required")
} }