clean up code

Author: harivall

controllers/elbv2/eventhandlers/endpointslices.go

@@ -2,9 +2,9 @@ package eventhandlers
 
 import (
 	"context"
-	"errors"
 
 	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
 	discv1 "k8s.io/api/discovery/v1beta1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/types"
@@ -18,6 +18,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
+const svcNameLabel = "kubernetes.io/service-name"
+
 // NewEnqueueRequestsForEndpointSlicesEvent constructs new enqueueRequestsForEndpointSlicesEvent.
 func NewEnqueueRequestsForEndpointSlicesEvent(k8sClient client.Client, logger logr.Logger) handler.EventHandler {
 	return &enqueueRequestsForEndpointSlicesEvent{
@@ -44,7 +46,7 @@ func (h *enqueueRequestsForEndpointSlicesEvent) Create(e event.CreateEvent, queu
 func (h *enqueueRequestsForEndpointSlicesEvent) Update(e event.UpdateEvent, queue workqueue.RateLimitingInterface) {
 	epOld := e.ObjectOld.(*discv1.EndpointSlice)
 	epNew := e.ObjectNew.(*discv1.EndpointSlice)
-	h.logger.Info("Update event for EndpointSlices", "name", epNew.Name)
+	h.logger.V(1).Info("Update event for EndpointSlices", "name", epNew.Name)
 	if !equality.Semantic.DeepEqual(epOld.Ports, epNew.Ports) || !equality.Semantic.DeepEqual(epOld.Endpoints, epNew.Endpoints) {
 		h.logger.V(1).Info("Enqueue EndpointSlice", "name", epNew.Name)
 		h.enqueueImpactedTargetGroupBindings(queue, epNew)
@@ -65,10 +67,9 @@ func (h *enqueueRequestsForEndpointSlicesEvent) Generic(event.GenericEvent, work
 
 func (h *enqueueRequestsForEndpointSlicesEvent) enqueueImpactedTargetGroupBindings(queue workqueue.RateLimitingInterface, epSlice *discv1.EndpointSlice) {
 	tgbList := &elbv2api.TargetGroupBindingList{}
-	const svcNameLabel = "kubernetes.io/service-name"
 	svcName, present := epSlice.Labels[svcNameLabel]
 	if !present {
-		err := errors.New("EndpointSlice does not have a" + svcNameLabel + "label")
+		err := errors.Errorf("EndpointSlice does not have a %v label", svcNameLabel)
 		h.logger.Error(err, "unable to find service name for endpointslice")
 		return
 	}

controllers/elbv2/targetgroupbinding_controller.go

@@ -96,7 +96,6 @@ func (r *targetGroupBindingReconciler) Reconcile(ctx context.Context, req ctrl.R
 
 func (r *targetGroupBindingReconciler) reconcile(ctx context.Context, req ctrl.Request) error {
 	tgb := &elbv2api.TargetGroupBinding{}
-	r.logger.V(1).Info("reconcile request Get", "name", req.Name, "tgb name", tgb.ObjectMeta.Name)
 	if err := r.k8sClient.Get(ctx, req.NamespacedName, tgb); err != nil {
 		return client.IgnoreNotFound(err)
 	}

pkg/backend/endpoint_resolver.go

@@ -16,6 +16,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const svcNameLabel = "kubernetes.io/service-name"
+
 var ErrNotFound = errors.New("backend not found")
 
 // TODO: for pod endpoints, we currently rely on endpoints events, we might change to use pod events directly in the future.
@@ -139,7 +141,6 @@ func (r *defaultEndpointResolver) ResolvePodEndpointsFromSlices(ctx context.Cont
 		return nil, false, err
 	}
 
-	const svcNameLabel = "kubernetes.io/service-name"
 	epSlicesList := &discv1.EndpointSliceList{}
 	if err := r.k8sClient.List(ctx, epSlicesList,
 		client.InNamespace(svcKey.Namespace),

pkg/config/controller_config.go

@@ -68,7 +68,7 @@ type ControllerConfig struct {
 	// the SSL Policy annotation.
 	DefaultSSLPolicy string
 
-	// Whether to use endpointslices resources(true) or Endpoints resources(false) in endpoint and TGB resolution.
+	//  Enable EndpointSlices for IP targets instead of Endpoints
 	EnableEndpointSlices bool
 
 	// Max concurrent reconcile loops for Service objects