From a96358ac0fa338d0efed794f35bd6f38a9097f37 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 13 Apr 2023 19:50:26 -0400 Subject: [PATCH] Remove some useless error checks Don't return errors in the event of programmer errors, and don't double-check things that were already validated. --- cmd/kube-proxy/app/server_others.go | 8 -------- cmd/kube-proxy/app/server_windows.go | 4 ---- 2 files changed, 12 deletions(-) diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index c4121feb989..9f8d4bed03f 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -79,10 +79,6 @@ func newProxyServer( config *proxyconfigapi.KubeProxyConfiguration, master string) (*ProxyServer, error) { - if config == nil { - return nil, errors.New("config is required") - } - if c, err := configz.New(proxyconfigapi.GroupName); err == nil { c.Set(config) } else { @@ -188,10 +184,6 @@ func newProxyServer( if proxyMode == proxyconfigapi.ProxyModeIPTables { klog.InfoS("Using iptables Proxier") - if config.IPTables.MasqueradeBit == nil { - // MasqueradeBit must be specified or defaulted. - return nil, fmt.Errorf("unable to read IPTables MasqueradeBit from config") - } if dualStack { klog.InfoS("kube-proxy running in dual-stack mode", "ipFamily", iptInterface.Protocol()) diff --git a/cmd/kube-proxy/app/server_windows.go b/cmd/kube-proxy/app/server_windows.go index a6ba3eff5ce..02eccb8ef31 100644 --- a/cmd/kube-proxy/app/server_windows.go +++ b/cmd/kube-proxy/app/server_windows.go @@ -51,10 +51,6 @@ func NewProxyServer(o *Options) (*ProxyServer, error) { } func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string) (*ProxyServer, error) { - if config == nil { - return nil, errors.New("config is required") - } - if c, err := configz.New(proxyconfigapi.GroupName); err == nil { c.Set(config) } else {