Merge pull request #79846 from aramase/fix-golint-pkg/proxy

Fix golint failures in pkg/proxy

cmd/kube-proxy/app/server.go

@@ -465,7 +465,7 @@ type ProxyServer struct {
 	IpvsInterface          utilipvs.Interface
 	IpsetInterface         utilipset.Interface
 	execer                 exec.Interface
-	Proxier                proxy.ProxyProvider
+	Proxier                proxy.Provider
 	Broadcaster            record.EventBroadcaster
 	Recorder               record.EventRecorder
 	ConntrackConfiguration kubeproxyconfig.KubeProxyConntrackConfiguration

cmd/kube-proxy/app/server_others.go

@@ -131,7 +131,7 @@ func newProxyServer(
 		healthzUpdater = healthzServer
 	}
 
-	var proxier proxy.ProxyProvider
+	var proxier proxy.Provider
 
 	proxyMode := getProxyMode(string(config.Mode), kernelHandler, ipsetInterface, iptables.LinuxKernelCompatTester{})
 	nodeIP := net.ParseIP(config.BindAddress)

cmd/kube-proxy/app/server_windows.go

@@ -94,7 +94,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExi
 		healthzUpdater = healthzServer
 	}
 
-	var proxier proxy.ProxyProvider
+	var proxier proxy.Provider
 
 	proxyMode := getProxyMode(string(config.Mode), winkernel.WindowsKernelCompatTester{})
 	if proxyMode == proxyModeKernelspace {

hack/.golint_failures

@@ -141,7 +141,6 @@ pkg/kubemark
 pkg/master
 pkg/master/controller/crdregistration
 pkg/master/tunneler
-pkg/proxy
 pkg/proxy/apis/config
 pkg/proxy/apis/config/v1alpha1
 pkg/proxy/userspace

pkg/kubemark/hollow_proxy.go

@@ -70,7 +70,7 @@ func NewHollowProxyOrDie(
 	proxierMinSyncPeriod time.Duration,
 ) (*HollowProxy, error) {
 	// Create proxier and service/endpoint handlers.
-	var proxier proxy.ProxyProvider
+	var proxier proxy.Provider
 	var err error
 
 	if useRealProxier {

pkg/proxy/endpoints.go

@@ -205,7 +205,7 @@ type UpdateEndpointMapResult struct {
 	LastChangeTriggerTimes []time.Time
 }
 
-// UpdateEndpointsMap updates endpointsMap base on the given changes.
+// Update updates endpointsMap base on the given changes.
 func (em EndpointsMap) Update(changes *EndpointChangeTracker) (result UpdateEndpointMapResult) {
 	result.StaleEndpoints = make([]ServiceEndpoint, 0)
 	result.StaleServiceNames = make([]ServicePortName, 0)

pkg/proxy/iptables/proxier.go

@@ -235,8 +235,8 @@ func (l *listenPortOpener) OpenLocalPort(lp *utilproxy.LocalPort) (utilproxy.Clo
 	return openLocalPort(lp)
 }
 
-// Proxier implements ProxyProvider
+// Proxier implements proxy.Provider
-var _ proxy.ProxyProvider = &Proxier{}
+var _ proxy.Provider = &Proxier{}
 
 // NewProxier returns a new Proxier given an iptables Interface instance.
 // Because of the iptables logic, it is assumed that there is only a single Proxier active on a machine.

pkg/proxy/ipvs/proxier.go

@@ -273,8 +273,8 @@ func (r *realIPGetter) NodeIPs() (ips []net.IP, err error) {
 	return ips, nil
 }
 
-// Proxier implements ProxyProvider
+// Proxier implements proxy.Provider
-var _ proxy.ProxyProvider = &Proxier{}
+var _ proxy.Provider = &Proxier{}
 
 // parseExcludedCIDRs parses the input strings and returns net.IPNet
 // The validation has been done earlier so the error condition will never happen under normal conditions

pkg/proxy/types.go

@@ -25,12 +25,12 @@ import (
 	"k8s.io/kubernetes/pkg/proxy/config"
 )
 
-// ProxyProvider is the interface provided by proxier implementations.
+// Provider is the interface provided by proxier implementations.
-type ProxyProvider interface {
+type Provider interface {
 	config.EndpointsHandler
 	config.ServiceHandler
 
-	// Sync immediately synchronizes the ProxyProvider's current state to proxy rules.
+	// Sync immediately synchronizes the Provider's current state to proxy rules.
 	Sync()
 	// SyncLoop runs periodic work.
 	// This is expected to run as a goroutine or as the main loop of the app.

pkg/proxy/userspace/proxier.go

@@ -138,8 +138,8 @@ type Proxier struct {
 	stopChan chan struct{}
 }
 
-// assert Proxier is a ProxyProvider
+// assert Proxier is a proxy.Provider
-var _ proxy.ProxyProvider = &Proxier{}
+var _ proxy.Provider = &Proxier{}
 
 // A key for the portMap.  The ip has to be a string because slices can't be map
 // keys.

pkg/proxy/winkernel/proxier.go

@@ -510,8 +510,8 @@ type closeable interface {
 	Close() error
 }
 
-// Proxier implements ProxyProvider
+// Proxier implements proxy.Provider
-var _ proxy.ProxyProvider = &Proxier{}
+var _ proxy.Provider = &Proxier{}
 
 // NewProxier returns a new Proxier
 func NewProxier(

pkg/proxy/winuserspace/proxier.go

@@ -92,8 +92,8 @@ type Proxier struct {
 	hostIP         net.IP
 }
 
-// assert Proxier is a ProxyProvider
+// assert Proxier is a proxy.Provider
-var _ proxy.ProxyProvider = &Proxier{}
+var _ proxy.Provider = &Proxier{}
 
 // A key for the portMap.  The ip has to be a string because slices can't be map
 // keys.