Skip to content

Commit 5085785

Browse files
Karthik-K-NKarthik-K-N
committed
Log resource kind in predicate logs
1 parent c4d1b8a commit 5085785

File tree

27 files changed

+73
-64
lines changed

27 files changed

+73
-64
lines changed

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
117117
Watches(
118118
&clusterv1.Machine{},
119119
handler.EnqueueRequestsFromMapFunc(r.MachineToBootstrapMapFunc),
120-
).WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue))
120+
).WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue))
121121

122122
if feature.Gates.Enabled(feature.MachinePool) {
123123
b = b.Watches(
@@ -132,7 +132,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
132132
builder.WithPredicates(
133133
predicates.All(predicateLog,
134134
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
135-
predicates.ResourceHasFilterLabel(predicateLog, r.WatchFilterValue),
135+
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
136136
),
137137
),
138138
)

‎controllers/external/tracker.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
"github.com/go-logr/logr"
2424
"github.com/pkg/errors"
25+
"k8s.io/apimachinery/pkg/runtime"
2526
"sigs.k8s.io/controller-runtime/pkg/cache"
2627
"sigs.k8s.io/controller-runtime/pkg/client"
2728
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -41,7 +42,7 @@ type ObjectTracker struct {
4142
}
4243

4344
// Watch uses the controller to issue a Watch only if the object hasn't been seen before.
44-
func (o *ObjectTracker) Watch(log logr.Logger, obj client.Object, handler handler.EventHandler, p ...predicate.Predicate) error {
45+
func (o *ObjectTracker) Watch(scheme *runtime.Scheme, log logr.Logger, obj client.Object, handler handler.EventHandler, p ...predicate.Predicate) error {
4546
// Consider this a no-op if the controller isn't present.
4647
if o.Controller == nil {
4748
return nil
@@ -58,7 +59,7 @@ func (o *ObjectTracker) Watch(log logr.Logger, obj client.Object, handler handle
5859
o.Cache,
5960
obj.DeepCopyObject().(client.Object),
6061
handler,
61-
append(p, predicates.ResourceNotPaused(log))...,
62+
append(p, predicates.ResourceNotPaused(scheme, log))...,
6263
))
6364
if err != nil {
6465
o.m.Delete(key)

‎controllers/external/tracker_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
. "github.com/onsi/gomega"
2424
"github.com/pkg/errors"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26+
"k8s.io/apimachinery/pkg/runtime"
2627
"sigs.k8s.io/controller-runtime/pkg/controller"
2728
"sigs.k8s.io/controller-runtime/pkg/log"
2829
"sigs.k8s.io/controller-runtime/pkg/source"
@@ -66,11 +67,12 @@ func TestRetryWatch(t *testing.T) {
6667
ctrl := newWatchCountController(true)
6768
tracker := ObjectTracker{Controller: ctrl}
6869

69-
err := tracker.Watch(logger, &clusterv1.Cluster{}, nil)
70+
scheme := runtime.NewScheme()
71+
err := tracker.Watch(scheme, logger, &clusterv1.Cluster{}, nil)
7072
g.Expect(err).To(HaveOccurred())
7173
g.Expect(ctrl.count).Should(Equal(1))
7274
// Calling Watch on same Object kind that failed earlier should be retryable.
73-
err = tracker.Watch(logger, &clusterv1.Cluster{}, nil)
75+
err = tracker.Watch(scheme, logger, &clusterv1.Cluster{}, nil)
7476
g.Expect(err).To(HaveOccurred())
7577
g.Expect(ctrl.count).Should(Equal(2))
7678
}
@@ -86,11 +88,12 @@ func TestWatchMultipleTimes(t *testing.T) {
8688
APIVersion: clusterv1.GroupVersion.Version,
8789
},
8890
}
89-
err := tracker.Watch(logger, obj, nil)
91+
scheme := runtime.NewScheme()
92+
err := tracker.Watch(scheme, logger, obj, nil)
9093
g.Expect(err).ToNot(HaveOccurred())
9194
g.Expect(ctrl.count).Should(Equal(1))
9295
// Calling Watch on same Object kind should not register watch again.
93-
err = tracker.Watch(logger, obj, nil)
96+
err = tracker.Watch(scheme, logger, obj, nil)
9497
g.Expect(err).ToNot(HaveOccurred())
9598
g.Expect(ctrl.count).Should(Equal(1))
9699
}

‎controllers/remote/cluster_cache_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (r *ClusterCacheReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
4646
Named("remote/clustercache").
4747
For(&clusterv1.Cluster{}).
4848
WithOptions(options).
49-
WithEventFilter(predicates.ResourceHasFilterLabel(predicateLog, r.WatchFilterValue)).
49+
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
5050
Complete(r)
5151

5252
if err != nil {

‎controlplane/kubeadm/internal/controllers/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
9898
For(&controlplanev1.KubeadmControlPlane{}).
9999
Owns(&clusterv1.Machine{}).
100100
WithOptions(options).
101-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue)).
101+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
102102
Watches(
103103
&clusterv1.Cluster{},
104104
handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmControlPlane),
105105
builder.WithPredicates(
106106
predicates.All(predicateLog,
107-
predicates.ResourceHasFilterLabel(predicateLog, r.WatchFilterValue),
107+
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
108108
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
109109
),
110110
),

‎exp/addons/internal/controllers/clusterresourceset_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr
9898
resourcepredicates.TypedResourceCreateOrUpdate[*metav1.PartialObjectMetadata](predicateLog),
9999
)).
100100
WithOptions(options).
101-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue)).
101+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
102102
Complete(r)
103103
if err != nil {
104104
return errors.Wrap(err, "failed setting up with a controller manager")

‎exp/addons/internal/controllers/clusterresourcesetbinding_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Conte
5656
handler.EnqueueRequestsFromMapFunc(r.clusterToClusterResourceSetBinding),
5757
).
5858
WithOptions(options).
59-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue)).
59+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
6060
Complete(r)
6161
if err != nil {
6262
return errors.Wrap(err, "failed setting up with a controller manager")

‎exp/internal/controllers/machinepool_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ func (r *MachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
108108
c, err := ctrl.NewControllerManagedBy(mgr).
109109
For(&expv1.MachinePool{}).
110110
WithOptions(options).
111-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue)).
111+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
112112
Watches(
113113
&clusterv1.Cluster{},
114114
handler.EnqueueRequestsFromMapFunc(clusterToMachinePools),
115115
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
116116
builder.WithPredicates(
117117
predicates.All(predicateLog,
118118
predicates.ClusterUnpaused(predicateLog),
119-
predicates.ResourceHasFilterLabel(predicateLog, r.WatchFilterValue),
119+
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
120120
),
121121
),
122122
).

‎exp/internal/controllers/machinepool_controller_phases.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (r *MachinePoolReconciler) reconcileExternal(ctx context.Context, cluster *
123123
}
124124

125125
// Ensure we add a watch to the external object, if there isn't one already.
126-
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &expv1.MachinePool{})); err != nil {
126+
if err := r.externalTracker.Watch(r.Client.Scheme(), log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &expv1.MachinePool{})); err != nil {
127127
return external.ReconcileOutput{}, err
128128
}
129129

@@ -379,7 +379,7 @@ func (r *MachinePoolReconciler) reconcileMachines(ctx context.Context, s *scope,
379379
sampleInfraMachine.SetKind(infraMachineKind)
380380

381381
// Add watcher for infraMachine, if there isn't one already.
382-
if err := r.externalTracker.Watch(log, sampleInfraMachine, handler.EnqueueRequestsFromMapFunc(r.infraMachineToMachinePoolMapper)); err != nil {
382+
if err := r.externalTracker.Watch(r.Client.Scheme(), log, sampleInfraMachine, handler.EnqueueRequestsFromMapFunc(r.infraMachineToMachinePoolMapper)); err != nil {
383383
return err
384384
}
385385

‎exp/runtime/internal/controllers/extensionconfig_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
7979
),
8080
)).
8181
WithOptions(options).
82-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(predicateLog, r.WatchFilterValue)).
82+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
8383
Complete(r)
8484
if err != nil {
8585
return errors.Wrap(err, "failed setting up with a controller manager")

0 commit comments

Comments
 (0)