github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix lint errors in pkg/contoller/endpoint

Browse Source 
Also mark reason for lint errors in:
pkg/controller/endpoint/config/v1alpha1,
pkg/controller/endpointslice/config/v1alpha1
pkg/controller/endpointslicemirroring/config/v1alpha1
This commit is contained in:
Martin Schimandl 2020-10-01 09:08:48 +02:00
parent 4b24dca228
commit 104ad794e5
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/.golint_failures
View File

@ -57,10 +57,9 @@ pkg/controller/daemon/config/v1alpha1
pkg/controller/deployment pkg/controller/deployment
pkg/controller/deployment/config/v1alpha1 pkg/controller/deployment/config/v1alpha1
pkg/controller/disruption pkg/controller/disruption
pkg/controller/endpoint pkg/controller/endpoint/config/v1alpha1 # only 'don't use underscores in Go names' due to auto generated functions
pkg/controller/endpoint/config/v1alpha1 pkg/controller/endpointslice/config/v1alpha1 # only 'don't use underscores in Go names' due to auto generated functions
pkg/controller/endpointslice/config/v1alpha1 pkg/controller/endpointslicemirroring/config/v1alpha1 # only 'don't use underscores in Go names' due to auto generated functions
pkg/controller/endpointslicemirroring/config/v1alpha1
pkg/controller/garbagecollector pkg/controller/garbagecollector
pkg/controller/garbagecollector/config/v1alpha1 pkg/controller/garbagecollector/config/v1alpha1
pkg/controller/job/config/v1alpha1 pkg/controller/job/config/v1alpha1

34
pkg/controller/endpoint/endpoints_controller.go
View File

@ -75,9 +75,9 @@ const (
TolerateUnreadyEndpointsAnnotation = "service.alpha.kubernetes.io/tolerate-unready-endpoints" TolerateUnreadyEndpointsAnnotation = "service.alpha.kubernetes.io/tolerate-unready-endpoints"
) )
// NewEndpointController returns a new *EndpointController. // NewEndpointController returns a new *Controller.
func NewEndpointController(podInformer coreinformers.PodInformer, serviceInformer coreinformers.ServiceInformer, func NewEndpointController(podInformer coreinformers.PodInformer, serviceInformer coreinformers.ServiceInformer,
endpointsInformer coreinformers.EndpointsInformer, client clientset.Interface, endpointUpdatesBatchPeriod time.Duration) *EndpointController { endpointsInformer coreinformers.EndpointsInformer, client clientset.Interface, endpointUpdatesBatchPeriod time.Duration) *Controller {
broadcaster := record.NewBroadcaster() broadcaster := record.NewBroadcaster()
broadcaster.StartStructuredLogging(0) broadcaster.StartStructuredLogging(0)
broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: client.CoreV1().Events("")}) broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: client.CoreV1().Events("")})
@ -86,7 +86,7 @@ func NewEndpointController(podInformer coreinformers.PodInformer, serviceInforme
if client != nil && client.CoreV1().RESTClient().GetRateLimiter() != nil { if client != nil && client.CoreV1().RESTClient().GetRateLimiter() != nil {
ratelimiter.RegisterMetricAndTrackRateLimiterUsage("endpoint_controller", client.CoreV1().RESTClient().GetRateLimiter()) ratelimiter.RegisterMetricAndTrackRateLimiterUsage("endpoint_controller", client.CoreV1().RESTClient().GetRateLimiter())
} }
e := &EndpointController{ e := &Controller{
client: client, client: client,
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "endpoint"), queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "endpoint"),
workerLoopPeriod: time.Second, workerLoopPeriod: time.Second,
@ -127,8 +127,8 @@ func NewEndpointController(podInformer coreinformers.PodInformer, serviceInforme
return e return e
} }
// EndpointController manages selector-based service endpoints. // Controller manages selector-based service endpoints.
type EndpointController struct { type Controller struct {
client clientset.Interface client clientset.Interface
eventBroadcaster record.EventBroadcaster eventBroadcaster record.EventBroadcaster
eventRecorder record.EventRecorder eventRecorder record.EventRecorder
@ -177,7 +177,7 @@ type EndpointController struct {
// Run will not return until stopCh is closed. workers determines how many // Run will not return until stopCh is closed. workers determines how many
// endpoints will be handled in parallel. // endpoints will be handled in parallel.
func (e *EndpointController) Run(workers int, stopCh <-chan struct{}) { func (e *Controller) Run(workers int, stopCh <-chan struct{}) {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer e.queue.ShutDown() defer e.queue.ShutDown()
@ -202,7 +202,7 @@ func (e *EndpointController) Run(workers int, stopCh <-chan struct{}) {
// When a pod is added, figure out what services it will be a member of and // When a pod is added, figure out what services it will be a member of and
// enqueue them. obj must have *v1.Pod type. // enqueue them. obj must have *v1.Pod type.
func (e *EndpointController) addPod(obj interface{}) { func (e *Controller) addPod(obj interface{}) {
pod := obj.(*v1.Pod) pod := obj.(*v1.Pod)
services, err := e.serviceSelectorCache.GetPodServiceMemberships(e.serviceLister, pod) services, err := e.serviceSelectorCache.GetPodServiceMemberships(e.serviceLister, pod)
if err != nil { if err != nil {
@ -250,7 +250,7 @@ func podToEndpointAddressForService(svc *v1.Service, pod *v1.Pod) (*v1.EndpointA
// When a pod is updated, figure out what services it used to be a member of // When a pod is updated, figure out what services it used to be a member of
// and what services it will be a member of, and enqueue the union of these. // and what services it will be a member of, and enqueue the union of these.
// old and cur must be *v1.Pod types. // old and cur must be *v1.Pod types.
func (e *EndpointController) updatePod(old, cur interface{}) { func (e *Controller) updatePod(old, cur interface{}) {
services := endpointutil.GetServicesToUpdateOnPodChange(e.serviceLister, e.serviceSelectorCache, old, cur) services := endpointutil.GetServicesToUpdateOnPodChange(e.serviceLister, e.serviceSelectorCache, old, cur)
for key := range services { for key := range services {
e.queue.AddAfter(key, e.endpointUpdatesBatchPeriod) e.queue.AddAfter(key, e.endpointUpdatesBatchPeriod)
@ -259,7 +259,7 @@ func (e *EndpointController) updatePod(old, cur interface{}) {
// When a pod is deleted, enqueue the services the pod used to be a member of. // When a pod is deleted, enqueue the services the pod used to be a member of.
// obj could be an *v1.Pod, or a DeletionFinalStateUnknown marker item. // obj could be an *v1.Pod, or a DeletionFinalStateUnknown marker item.
func (e *EndpointController) deletePod(obj interface{}) { func (e *Controller) deletePod(obj interface{}) {
pod := endpointutil.GetPodFromDeleteAction(obj) pod := endpointutil.GetPodFromDeleteAction(obj)
if pod != nil { if pod != nil {
e.addPod(pod) e.addPod(pod)
@ -267,7 +267,7 @@ func (e *EndpointController) deletePod(obj interface{}) {
} }
// onServiceUpdate updates the Service Selector in the cache and queues the Service for processing. // onServiceUpdate updates the Service Selector in the cache and queues the Service for processing.
func (e *EndpointController) onServiceUpdate(obj interface{}) { func (e *Controller) onServiceUpdate(obj interface{}) {
key, err := controller.KeyFunc(obj) key, err := controller.KeyFunc(obj)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
@ -279,7 +279,7 @@ func (e *EndpointController) onServiceUpdate(obj interface{}) {
} }
// onServiceDelete removes the Service Selector from the cache and queues the Service for processing. // onServiceDelete removes the Service Selector from the cache and queues the Service for processing.
func (e *EndpointController) onServiceDelete(obj interface{}) { func (e *Controller) onServiceDelete(obj interface{}) {
key, err := controller.KeyFunc(obj) key, err := controller.KeyFunc(obj)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
@ -290,7 +290,7 @@ func (e *EndpointController) onServiceDelete(obj interface{}) {
e.queue.Add(key) e.queue.Add(key)
} }
func (e *EndpointController) onEndpointsDelete(obj interface{}) { func (e *Controller) onEndpointsDelete(obj interface{}) {
key, err := controller.KeyFunc(obj) key, err := controller.KeyFunc(obj)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
@ -303,12 +303,12 @@ func (e *EndpointController) onEndpointsDelete(obj interface{}) {
// marks them done. You may run as many of these in parallel as you wish; the // marks them done. You may run as many of these in parallel as you wish; the
// workqueue guarantees that they will not end up processing the same service // workqueue guarantees that they will not end up processing the same service
// at the same time. // at the same time.
func (e *EndpointController) worker() { func (e *Controller) worker() {
for e.processNextWorkItem() { for e.processNextWorkItem() {
} }
} }
func (e *EndpointController) processNextWorkItem() bool { func (e *Controller) processNextWorkItem() bool {
eKey, quit := e.queue.Get() eKey, quit := e.queue.Get()
if quit { if quit {
return false return false
@ -321,7 +321,7 @@ func (e *EndpointController) processNextWorkItem() bool {
return true return true
} }
func (e *EndpointController) handleErr(err error, key interface{}) { func (e *Controller) handleErr(err error, key interface{}) {
if err == nil { if err == nil {
e.queue.Forget(key) e.queue.Forget(key)
return return
@ -343,7 +343,7 @@ func (e *EndpointController) handleErr(err error, key interface{}) {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} }
func (e *EndpointController) syncService(key string) error { func (e *Controller) syncService(key string) error {
startTime := time.Now() startTime := time.Now()
defer func() { defer func() {
klog.V(4).Infof("Finished syncing service %q endpoints. (%v)", key, time.Since(startTime)) klog.V(4).Infof("Finished syncing service %q endpoints. (%v)", key, time.Since(startTime))
@ -550,7 +550,7 @@ func (e *EndpointController) syncService(key string) error {
// do this once on startup, because in steady-state these are detected (but // do this once on startup, because in steady-state these are detected (but
// some stragglers could have been left behind if the endpoint controller // some stragglers could have been left behind if the endpoint controller
// reboots). // reboots).
func (e *EndpointController) checkLeftoverEndpoints() { func (e *Controller) checkLeftoverEndpoints() {
list, err := e.endpointsLister.List(labels.Everything()) list, err := e.endpointsLister.List(labels.Everything())
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err)) utilruntime.HandleError(fmt.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err))

6
pkg/controller/endpoint/endpoints_controller_test.go
View File

@ -42,7 +42,7 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/controller" controllerpkg "k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
utilnet "k8s.io/utils/net" utilnet "k8s.io/utils/net"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
@ -203,7 +203,7 @@ func makeBlockingEndpointDeleteTestServer(t *testing.T, controller *endpointCont
} }
type endpointController struct { type endpointController struct {
*EndpointController *Controller
podStore cache.Store podStore cache.Store
serviceStore cache.Store serviceStore cache.Store
endpointsStore cache.Store endpointsStore cache.Store
@ -211,7 +211,7 @@ type endpointController struct {
func newController(url string, batchPeriod time.Duration) *endpointController { func newController(url string, batchPeriod time.Duration) *endpointController {
client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(client, controllerpkg.NoResyncPeriodFunc())
endpoints := NewEndpointController(informerFactory.Core().V1().Pods(), informerFactory.Core().V1().Services(), endpoints := NewEndpointController(informerFactory.Core().V1().Pods(), informerFactory.Core().V1().Services(),
informerFactory.Core().V1().Endpoints(), client, batchPeriod) informerFactory.Core().V1().Endpoints(), client, batchPeriod)
endpoints.podsSynced = alwaysReady endpoints.podsSynced = alwaysReady