diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 095a0c288dc..2a9edeb4e79 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -468,7 +468,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 diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go index a86a9593cf5..d9693c4f777 100644 --- a/cmd/kube-proxy/app/server_others.go +++ b/cmd/kube-proxy/app/server_others.go @@ -132,7 +132,7 @@ func newProxyServer( healthzUpdater = healthzServer } - var proxier proxy.ProxyProvider + var proxier proxy.Provider proxyMode := getProxyMode(string(config.Mode), iptInterface, kernelHandler, ipsetInterface, iptables.LinuxKernelCompatTester{}) nodeIP := net.ParseIP(config.BindAddress) diff --git a/cmd/kube-proxy/app/server_windows.go b/cmd/kube-proxy/app/server_windows.go index b34e7e086ba..3332b96b8a3 100644 --- a/cmd/kube-proxy/app/server_windows.go +++ b/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 { diff --git a/hack/.golint_failures b/hack/.golint_failures index dec185def3f..da21bf27441 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -179,7 +179,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 diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index e2665845f1f..5a77012c74f 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/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 { diff --git a/pkg/proxy/endpoints.go b/pkg/proxy/endpoints.go index 38754d3ecfc..cb8d87600b9 100644 --- a/pkg/proxy/endpoints.go +++ b/pkg/proxy/endpoints.go @@ -200,7 +200,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) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 7f2abc42ec6..e2cee22bb71 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -272,8 +272,8 @@ func (l *listenPortOpener) OpenLocalPort(lp *utilproxy.LocalPort) (utilproxy.Clo return openLocalPort(lp) } -// Proxier implements ProxyProvider -var _ proxy.ProxyProvider = &Proxier{} +// Proxier implements proxy.Provider +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. diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 64aa1ddee84..1166b80a8b2 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -271,8 +271,8 @@ func (r *realIPGetter) NodeIPs() (ips []net.IP, err error) { return ips, nil } -// Proxier implements ProxyProvider -var _ proxy.ProxyProvider = &Proxier{} +// Proxier implements proxy.Provider +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 diff --git a/pkg/proxy/types.go b/pkg/proxy/types.go index 5b62f7ed948..7279093c15b 100644 --- a/pkg/proxy/types.go +++ b/pkg/proxy/types.go @@ -25,12 +25,12 @@ import ( "k8s.io/kubernetes/pkg/proxy/config" ) -// ProxyProvider is the interface provided by proxier implementations. -type ProxyProvider interface { +// Provider is the interface provided by proxier implementations. +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. diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go index ae55842b302..46d9e9c86cb 100644 --- a/pkg/proxy/userspace/proxier.go +++ b/pkg/proxy/userspace/proxier.go @@ -138,8 +138,8 @@ type Proxier struct { stopChan chan struct{} } -// assert Proxier is a ProxyProvider -var _ proxy.ProxyProvider = &Proxier{} +// assert Proxier is a proxy.Provider +var _ proxy.Provider = &Proxier{} // A key for the portMap. The ip has to be a string because slices can't be map // keys. diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index ea435210da1..22fde005c3e 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -510,8 +510,8 @@ type closeable interface { Close() error } -// Proxier implements ProxyProvider -var _ proxy.ProxyProvider = &Proxier{} +// Proxier implements proxy.Provider +var _ proxy.Provider = &Proxier{} // NewProxier returns a new Proxier func NewProxier( diff --git a/pkg/proxy/winuserspace/proxier.go b/pkg/proxy/winuserspace/proxier.go index 91cbd6337c8..717a0bce553 100644 --- a/pkg/proxy/winuserspace/proxier.go +++ b/pkg/proxy/winuserspace/proxier.go @@ -92,8 +92,8 @@ type Proxier struct { hostIP net.IP } -// assert Proxier is a ProxyProvider -var _ proxy.ProxyProvider = &Proxier{} +// assert Proxier is a proxy.Provider +var _ proxy.Provider = &Proxier{} // A key for the portMap. The ip has to be a string because slices can't be map // keys.