Merge pull request #248 from slintes/prevent-status-reconcile

Prevent status triggered reconciles
medik8s · Aug 17, 2023 · 723a4ca · 723a4ca
2 parents 35a85c5 + 51bc5d5
commit 723a4ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/controllers/nodehealthcheck_controller.go b/controllers/nodehealthcheck_controller.go
@@ -98,7 +98,7 @@ type NodeHealthCheckReconciler struct {
 // SetupWithManager sets up the controller with the Manager.
 func (r *NodeHealthCheckReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	controller, err := ctrl.NewControllerManagedBy(mgr).
-		For(&remediationv1alpha1.NodeHealthCheck{}).
+		For(&remediationv1alpha1.NodeHealthCheck{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Watches(
 			&source.Kind{Type: &v1.Node{}},
 			handler.EnqueueRequestsFromMapFunc(utils.NHCByNodeMapperFunc(mgr.GetClient(), mgr.GetLogger())),

diff --git a/controllers/nodehealthcheck_controller_test.go b/controllers/nodehealthcheck_controller_test.go
@@ -497,12 +497,8 @@ var _ = Describe("Node Health Check CR", func() {
 					By("faking time and triggering another reconcile")
 					afterTimeout := time.Now().Add(remediationCRAlertTimeout).Add(2 * time.Minute)
 					fakeTime = &afterTimeout
-					labels := underTest.Labels
-					if labels == nil {
-						labels = make(map[string]string)
-					}
-					labels["trigger"] = "now"
-					underTest.Labels = labels
+					newMinHealthy := intstr.FromString("52%")
+					underTest.Spec.MinHealthy = &newMinHealthy
 					Expect(k8sClient.Update(context.Background(), underTest)).To(Succeed())
 					time.Sleep(2 * time.Second)