Skip to content

Commit b0f4021

Browse files
M00nF1shM00nF1sh
authored
style fixes (kubernetes-sigs#1504)
1 parent 89b15a3 commit b0f4021

File tree

16 files changed

+212
-139
lines changed

16 files changed

+212
-139
lines changed

‎controllers/elbv2/eventhandlers/endpoints.go

+10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/types"
99
"k8s.io/client-go/util/workqueue"
1010
elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
11+
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
1112
"sigs.k8s.io/aws-load-balancer-controller/pkg/targetgroupbinding"
1213
"sigs.k8s.io/controller-runtime/pkg/client"
1314
"sigs.k8s.io/controller-runtime/pkg/event"
@@ -65,7 +66,16 @@ func (h *enqueueRequestsForEndpointsEvent) enqueueImpactedTargetGroupBindings(qu
6566
return
6667
}
6768

69+
epKey := k8s.NamespacedName(ep)
6870
for _, tgb := range tgbList.Items {
71+
if tgb.Spec.TargetType == nil || (*tgb.Spec.TargetType) != elbv2api.TargetTypeIP {
72+
continue
73+
}
74+
75+
h.logger.V(1).Info("enqueue targetGroupBinding for endpoints event",
76+
"endpoints", epKey,
77+
"targetGroupBinding", k8s.NamespacedName(&tgb),
78+
)
6979
queue.Add(reconcile.Request{
7080
NamespacedName: types.NamespacedName{
7181
Namespace: tgb.Namespace,

‎controllers/elbv2/eventhandlers/node.go

+13-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
1111
"sigs.k8s.io/aws-load-balancer-controller/pkg/backend"
1212
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
13-
"sigs.k8s.io/aws-load-balancer-controller/pkg/targetgroupbinding"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514
"sigs.k8s.io/controller-runtime/pkg/event"
1615
"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -57,22 +56,29 @@ func (h *enqueueRequestsForNodeEvent) Generic(e event.GenericEvent, queue workqu
5756

5857
// enqueueImpactedEndpointBindings will enqueue all impacted TargetGroupBindings for node events.
5958
func (h *enqueueRequestsForNodeEvent) enqueueImpactedTargetGroupBindings(queue workqueue.RateLimitingInterface, nodeOld *corev1.Node, nodeNew *corev1.Node) {
59+
var nodeKey types.NamespacedName
6060
nodeOldIsReady := false
6161
nodeNewIsReady := false
6262
if nodeOld != nil {
63+
nodeKey = k8s.NamespacedName(nodeOld)
6364
nodeOldIsReady = k8s.IsNodeReady(nodeOld)
6465
}
6566
if nodeNew != nil {
67+
nodeKey = k8s.NamespacedName(nodeNew)
6668
nodeNewIsReady = k8s.IsNodeReady(nodeNew)
6769
}
6870

6971
tgbList := &elbv2api.TargetGroupBindingList{}
70-
if err := h.k8sClient.List(context.Background(), tgbList,
71-
client.MatchingFields{targetgroupbinding.IndexKeyTargetType: string(elbv2api.TargetTypeInstance)}); err != nil {
72+
if err := h.k8sClient.List(context.Background(), tgbList); err != nil {
7273
h.logger.Error(err, "failed to fetch targetGroupBindings")
7374
return
7475
}
76+
7577
for _, tgb := range tgbList.Items {
78+
if tgb.Spec.TargetType == nil || (*tgb.Spec.TargetType) != elbv2api.TargetTypeInstance {
79+
continue
80+
}
81+
7682
nodeSelector := backend.GetTrafficProxyNodeSelector(&tgb)
7783

7884
nodeOldIsTrafficProxy := false
@@ -85,6 +91,10 @@ func (h *enqueueRequestsForNodeEvent) enqueueImpactedTargetGroupBindings(queue w
8591
}
8692

8793
if nodeOldIsTrafficProxy != nodeNewIsTrafficProxy {
94+
h.logger.V(1).Info("enqueue targetGroupBinding for node event",
95+
"node", nodeKey,
96+
"targetGroupBinding", k8s.NamespacedName(&tgb),
97+
)
8898
queue.Add(reconcile.Request{
8999
NamespacedName: types.NamespacedName{
90100
Namespace: tgb.Namespace,

‎controllers/elbv2/targetgroupbinding_controller.go

+16-13
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,31 @@ import (
3636

3737
const (
3838
targetGroupBindingFinalizer = "elbv2.k8s.aws/resources"
39+
controllerName = "targetGroupBinding"
3940
)
4041

4142
// NewTargetGroupBindingReconciler constructs new targetGroupBindingReconciler
42-
func NewTargetGroupBindingReconciler(k8sClient client.Client, finalizerManager k8s.FinalizerManager, tgbResourceManager targetgroupbinding.ResourceManager, config config.ControllerConfig, logger logr.Logger) *targetGroupBindingReconciler {
43+
func NewTargetGroupBindingReconciler(k8sClient client.Client, finalizerManager k8s.FinalizerManager,
44+
tgbResourceManager targetgroupbinding.ResourceManager, config config.ControllerConfig,
45+
logger logr.Logger) *targetGroupBindingReconciler {
46+
4347
return &targetGroupBindingReconciler{
44-
k8sClient: k8sClient,
45-
finalizerManager: finalizerManager,
46-
tgbResourceManager: tgbResourceManager,
47-
logger: logger,
48+
k8sClient: k8sClient,
49+
finalizerManager: finalizerManager,
50+
tgbResourceManager: tgbResourceManager,
51+
logger: logger,
52+
4853
maxConcurrentReconciles: config.TargetgroupBindingMaxConcurrentReconciles,
4954
}
5055
}
5156

5257
// targetGroupBindingReconciler reconciles a TargetGroupBinding object
5358
type targetGroupBindingReconciler struct {
54-
k8sClient client.Client
55-
finalizerManager k8s.FinalizerManager
56-
tgbResourceManager targetgroupbinding.ResourceManager
57-
logger logr.Logger
59+
k8sClient client.Client
60+
finalizerManager k8s.FinalizerManager
61+
tgbResourceManager targetgroupbinding.ResourceManager
62+
logger logr.Logger
63+
5864
maxConcurrentReconciles int
5965
}
6066

@@ -118,6 +124,7 @@ func (r *targetGroupBindingReconciler) SetupWithManager(ctx context.Context, mgr
118124
r.logger.WithName("eventHandlers").WithName("node"))
119125
return ctrl.NewControllerManagedBy(mgr).
120126
For(&elbv2api.TargetGroupBinding{}).
127+
Named(controllerName).
121128
Watches(&source.Kind{Type: &corev1.Endpoints{}}, epEventsHandler).
122129
Watches(&source.Kind{Type: &corev1.Node{}}, nodeEventsHandler).
123130
WithOptions(controller.Options{MaxConcurrentReconciles: r.maxConcurrentReconciles}).
@@ -129,9 +136,5 @@ func (r *targetGroupBindingReconciler) setupIndexes(ctx context.Context, fieldIn
129136
targetgroupbinding.IndexKeyServiceRefName, targetgroupbinding.IndexFuncServiceRefName); err != nil {
130137
return err
131138
}
132-
if err := fieldIndexer.IndexField(ctx, &elbv2api.TargetGroupBinding{},
133-
targetgroupbinding.IndexKeyTargetType, targetgroupbinding.IndexFuncTargetType); err != nil {
134-
return err
135-
}
136139
return nil
137140
}

‎controllers/ingress/eventhandlers/ingress_events.go

+18-8
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ package eventhandlers
33
import (
44
"context"
55
"github.com/go-logr/logr"
6+
corev1 "k8s.io/api/core/v1"
67
networking "k8s.io/api/networking/v1beta1"
78
"k8s.io/apimachinery/pkg/api/equality"
9+
"k8s.io/apimachinery/pkg/types"
810
"k8s.io/client-go/tools/record"
911
"k8s.io/client-go/util/workqueue"
1012
"sigs.k8s.io/aws-load-balancer-controller/pkg/ingress"
13+
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
1114
"sigs.k8s.io/controller-runtime/pkg/event"
1215
"sigs.k8s.io/controller-runtime/pkg/handler"
1316
)
1417

15-
func NewEnqueueRequestsForIngressEvent(groupLoader ingress.GroupLoader, eventRecorder record.EventRecorder, logger logr.Logger) *enqueueRequestsForIngressEvent {
18+
func NewEnqueueRequestsForIngressEvent(groupLoader ingress.GroupLoader, eventRecorder record.EventRecorder,
19+
logger logr.Logger) *enqueueRequestsForIngressEvent {
1620
return &enqueueRequestsForIngressEvent{
1721
groupLoader: groupLoader,
1822
eventRecorder: eventRecorder,
@@ -43,7 +47,6 @@ func (h *enqueueRequestsForIngressEvent) Update(e event.UpdateEvent, queue workq
4347
if equality.Semantic.DeepEqual(ingOld.Annotations, ingNew.Annotations) &&
4448
equality.Semantic.DeepEqual(ingOld.Spec, ingNew.Spec) &&
4549
equality.Semantic.DeepEqual(ingOld.DeletionTimestamp.IsZero(), ingNew.DeletionTimestamp.IsZero()) {
46-
h.logger.V(1).Info("ignoring unchanged Ingress Update event", "event", e)
4750
return
4851
}
4952

@@ -62,22 +65,29 @@ func (h *enqueueRequestsForIngressEvent) Generic(e event.GenericEvent, queue wor
6265
}
6366

6467
func (h *enqueueRequestsForIngressEvent) enqueueIfBelongsToGroup(queue workqueue.RateLimitingInterface, ingList ...*networking.Ingress) {
65-
groupIDs := make(map[ingress.GroupID]struct{})
68+
sourceINGKeyByGroupID := make(map[ingress.GroupID]types.NamespacedName)
69+
6670
for _, ing := range ingList {
6771
groupID, err := h.groupLoader.FindGroupID(context.Background(), ing)
6872
if err != nil {
69-
// TODO: define eventType, reason enums.
70-
h.eventRecorder.Eventf(ing, "Warning", "malformed Ingress", "failed to find group for Ingress due to %w", err)
73+
h.eventRecorder.Eventf(ing, corev1.EventTypeWarning, k8s.IngressEventReasonFailedToLoadGroupID, "failed to load groupID for Ingress due to %w", err)
7174
continue
7275
}
76+
77+
ingKey := k8s.NamespacedName(ing)
7378
if groupID == nil {
74-
h.logger.V(1).Info("ignoring Ingress", "Ingress", ing)
79+
h.logger.V(1).Info("ignoring ingress", "ingress", ingKey)
7580
continue
7681
}
77-
groupIDs[*groupID] = struct{}{}
82+
83+
sourceINGKeyByGroupID[*groupID] = ingKey
7884
}
7985

80-
for groupID := range groupIDs {
86+
for groupID, sourceINGKey := range sourceINGKeyByGroupID {
87+
h.logger.V(1).Info("enqueue ingressGroup for ingress event",
88+
"ingress", sourceINGKey,
89+
"ingressGroup", groupID,
90+
)
8191
queue.Add(ingress.EncodeGroupIDToReconcileRequest(groupID))
8292
}
8393
}

‎controllers/ingress/eventhandlers/secret_events.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"k8s.io/client-go/tools/record"
1212
"k8s.io/client-go/util/workqueue"
1313
"sigs.k8s.io/aws-load-balancer-controller/pkg/ingress"
14+
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
1415
"sigs.k8s.io/controller-runtime/pkg/client"
1516
"sigs.k8s.io/controller-runtime/pkg/event"
1617
"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -51,7 +52,6 @@ func (h *enqueueRequestsForSecretEvent) Update(e event.UpdateEvent, _ workqueue.
5152
// 2. Secret deletions
5253
if equality.Semantic.DeepEqual(secretOld.Data, secretNew.Data) &&
5354
equality.Semantic.DeepEqual(secretOld.DeletionTimestamp.IsZero(), secretNew.DeletionTimestamp.IsZero()) {
54-
h.logger.V(1).Info("ignoring unchanged Secret Update event")
5555
return
5656
}
5757

@@ -67,6 +67,8 @@ func (h *enqueueRequestsForSecretEvent) Generic(e event.GenericEvent, _ workqueu
6767
}
6868

6969
func (h *enqueueRequestsForSecretEvent) enqueueImpactedObjects(secret metav1.Object) {
70+
secretKey := k8s.NamespacedName(secret)
71+
7072
ingList := &networking.IngressList{}
7173
if err := h.k8sClient.List(context.Background(), ingList,
7274
client.InNamespace(secret.GetNamespace()),
@@ -77,6 +79,10 @@ func (h *enqueueRequestsForSecretEvent) enqueueImpactedObjects(secret metav1.Obj
7779
for index := range ingList.Items {
7880
ing := &ingList.Items[index]
7981
meta, _ := meta.Accessor(ing)
82+
83+
h.logger.V(1).Info("enqueue ingress for secret event",
84+
"secret", secretKey,
85+
"ingress", k8s.NamespacedName(ing))
8086
h.ingEventChan <- event.GenericEvent{
8187
Meta: meta,
8288
Object: ing,
@@ -93,6 +99,10 @@ func (h *enqueueRequestsForSecretEvent) enqueueImpactedObjects(secret metav1.Obj
9399
for index := range svcList.Items {
94100
svc := &svcList.Items[index]
95101
meta, _ := meta.Accessor(svc)
102+
103+
h.logger.V(1).Info("enqueue service for secret event",
104+
"secret", secretKey,
105+
"service", k8s.NamespacedName(svc))
96106
h.svcEventChan <- event.GenericEvent{
97107
Meta: meta,
98108
Object: svc,

‎controllers/ingress/eventhandlers/service_events.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"k8s.io/client-go/tools/record"
1212
"k8s.io/client-go/util/workqueue"
1313
"sigs.k8s.io/aws-load-balancer-controller/pkg/ingress"
14+
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
1415
"sigs.k8s.io/controller-runtime/pkg/client"
1516
"sigs.k8s.io/controller-runtime/pkg/event"
1617
"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -51,7 +52,6 @@ func (h *enqueueRequestsForServiceEvent) Update(e event.UpdateEvent, _ workqueue
5152
if equality.Semantic.DeepEqual(svcOld.Annotations, svcNew.Annotations) &&
5253
equality.Semantic.DeepEqual(svcOld.Spec, svcNew.Spec) &&
5354
equality.Semantic.DeepEqual(svcOld.DeletionTimestamp.IsZero(), svcNew.DeletionTimestamp.IsZero()) {
54-
h.logger.V(1).Info("ignoring unchanged Service Update event", "event", e)
5555
return
5656
}
5757

@@ -75,9 +75,14 @@ func (h *enqueueRequestsForServiceEvent) enqueueImpactedIngresses(svc metav1.Obj
7575
return
7676
}
7777

78+
svcKey := k8s.NamespacedName(svc)
7879
for index := range ingList.Items {
7980
ing := &ingList.Items[index]
8081
meta, _ := meta.Accessor(ing)
82+
83+
h.logger.V(1).Info("enqueue ingress for service event",
84+
"service", svcKey,
85+
"ingress", k8s.NamespacedName(ing))
8186
h.ingEventChan <- event.GenericEvent{
8287
Meta: meta,
8388
Object: ing,

0 commit comments

Comments
 (0)