Skip to content

Commit 9e5ac69

Browse files
committed
Drop ReconcileError events
Signed-off-by: Stefan Büringer [email protected]
1 parent 80e26b4 commit 9e5ac69

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

internal/controllers/machinehealthcheck/machinehealthcheck_controller.go

-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
182182
log.V(5).Info("Requeuing because connection to the workload cluster is down")
183183
return ctrl.Result{RequeueAfter: time.Minute}, nil
184184
}
185-
r.recorder.Eventf(m, corev1.EventTypeWarning, "ReconcileError", "%v", err)
186185

187186
// Requeue immediately if any errors occurred
188187
return ctrl.Result{}, err

internal/controllers/machineset/machineset_controller.go

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (retres ct
256256
return ctrl.Result{RequeueAfter: time.Minute}, nil
257257
}
258258
err = kerr
259-
r.recorder.Eventf(s.machineSet, corev1.EventTypeWarning, "ReconcileError", "%v", kerr)
260259
}
261260
return result, err
262261
}

internal/controllers/machineset/machineset_controller_test.go

-24
Original file line numberDiff line numberDiff line change
@@ -613,30 +613,6 @@ func TestMachineSetReconcile(t *testing.T) {
613613
g.Expect(result).To(BeComparableTo(reconcile.Result{}))
614614
})
615615

616-
t.Run("records event if reconcile fails", func(t *testing.T) {
617-
g := NewWithT(t)
618-
619-
ms := newMachineSet("machineset1", testClusterName, int32(0))
620-
ms.Spec.Template.Spec.Bootstrap.ConfigRef = &corev1.ObjectReference{
621-
Kind: "FooTemplate",
622-
Namespace: ms.GetNamespace(),
623-
Name: "doesnotexist",
624-
}
625-
626-
request := reconcile.Request{
627-
NamespacedName: util.ObjectKey(ms),
628-
}
629-
630-
rec := record.NewFakeRecorder(32)
631-
c := fake.NewClientBuilder().WithObjects(testCluster, ms).WithStatusSubresource(&clusterv1.MachineSet{}).Build()
632-
msr := &Reconciler{
633-
Client: c,
634-
recorder: rec,
635-
}
636-
_, _ = msr.Reconcile(ctx, request)
637-
g.Eventually(rec.Events).Should(Receive())
638-
})
639-
640616
t.Run("reconcile successfully when labels are missing", func(t *testing.T) {
641617
g := NewWithT(t)
642618

0 commit comments

Comments
 (0)