From b905acaac777c0d42b46d6b33603fd2b779ea157 Mon Sep 17 00:00:00 2001 From: Fabian Wiesel Date: Tue, 17 Nov 2026 11:55:00 +0100 Subject: [PATCH] Watch all lifecycle-relevant Hypervisor conditions GardenerNodeLifecycleController reads Onboarding, Evicting, Offboarded, and HaEnabled from Hypervisor status, but its watch predicate only checked Evicting. Status-only transitions on the other conditions were dropped, leaving the blocking PodDisruptionBudget and signalling Deployment stale until an unrelated Node event occurred. Check all four conditions in the watch predicate. Signed-off-by: Fabian Wiesel --- .../gardener_node_lifecycle_controller.go | 26 ++++++- ...gardener_node_lifecycle_controller_test.go | 75 +++++++++++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/internal/controller/gardener_node_lifecycle_controller.go b/internal/controller/gardener_node_lifecycle_controller.go index 3cd803bb..6cbb736a 100644 --- a/internal/controller/gardener_node_lifecycle_controller.go +++ b/internal/controller/gardener_node_lifecycle_controller.go @@ -267,7 +267,7 @@ func (r *GardenerNodeLifecycleController) SetupWithManager(mgr ctrl.Manager, nam hypervisorToNode := handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &corev1.Node{}) - // Maintenance=termination bumps generation; Evicting status changes do not. + // Maintenance=termination bumps generation; status condition changes do not. hypervisorRelevantChange := predicate.Or( predicate.GenerationChangedPredicate{}, evictingConditionChangedPredicate{}, @@ -284,6 +284,15 @@ func (r *GardenerNodeLifecycleController) SetupWithManager(mgr ctrl.Manager, nam Complete(r) } +// reconcileRelevantConditions are the only Hypervisor conditions Reconcile +// reads, so status-only changes on them must trigger a reconcile. +var reconcileRelevantConditions = [...]string{ + kvmv1.ConditionTypeEvicting, + kvmv1.ConditionTypeOnboarding, + kvmv1.ConditionTypeOffboarded, + kvmv1.ConditionTypeHaEnabled, +} + // evictingConditionChangedPredicate complements GenerationChangedPredicate, // which ignores status-only updates. type evictingConditionChangedPredicate struct { @@ -299,8 +308,19 @@ func (evictingConditionChangedPredicate) Update(e event.UpdateEvent) bool { if !ok1 || !ok2 { return false } - oldCond := meta.FindStatusCondition(oldHv.Status.Conditions, kvmv1.ConditionTypeEvicting) - newCond := meta.FindStatusCondition(newHv.Status.Conditions, kvmv1.ConditionTypeEvicting) + for _, conditionType := range reconcileRelevantConditions { + if conditionStatusChanged(oldHv, newHv, conditionType) { + return true + } + } + return false +} + +// conditionStatusChanged reports whether the condition was added, removed, or +// changed its Status. +func conditionStatusChanged(oldHv, newHv *kvmv1.Hypervisor, conditionType string) bool { + oldCond := meta.FindStatusCondition(oldHv.Status.Conditions, conditionType) + newCond := meta.FindStatusCondition(newHv.Status.Conditions, conditionType) switch { case oldCond == nil && newCond == nil: return false diff --git a/internal/controller/gardener_node_lifecycle_controller_test.go b/internal/controller/gardener_node_lifecycle_controller_test.go index 9bb3218c..999cf5c2 100644 --- a/internal/controller/gardener_node_lifecycle_controller_test.go +++ b/internal/controller/gardener_node_lifecycle_controller_test.go @@ -30,6 +30,8 @@ import ( "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/event" + "sigs.k8s.io/controller-runtime/pkg/predicate" kvmv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1" ) @@ -262,4 +264,77 @@ var _ = Describe("Gardener Maintenance Controller", func() { }) }) }) + + Context("Hypervisor watch predicate", func() { + // Status-only updates keep the generation, so the watch drops them + // unless this predicate reports a relevant condition change. + predicateUnderTest := predicate.Predicate(evictingConditionChangedPredicate{}) + + makeCondition := func(t string, status metav1.ConditionStatus) metav1.Condition { + return metav1.Condition{ + Type: t, + Status: status, + Reason: "reason", + Message: "message", + } + } + + makeHypervisor := func(conds ...metav1.Condition) *kvmv1.Hypervisor { + hv := &kvmv1.Hypervisor{ + Name: "hv-predicate-test", + ResourceVersion: "1", + Generation: 1, + Spec: kvmv1.HypervisorSpec{LifecycleEnabled: true}, + } + for _, c := range conds { + meta.SetStatusCondition(&hv.Status.Conditions, c) + } + return hv + } + + DescribeTable("Update enqueues a reconcile when a condition inspected by Reconcile changes status", + func(oldConds, newConds []metav1.Condition, want bool) { + got := predicateUnderTest.Update(event.UpdateEvent{ + ObjectOld: makeHypervisor(oldConds...), + ObjectNew: makeHypervisor(newConds...), + }) + Expect(got).To(Equal(want)) + }, + Entry("Evicting appears", + nil, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeEvicting, metav1.ConditionTrue)}, + true, + ), + Entry("Evicting changes (True -> False)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeEvicting, metav1.ConditionTrue)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeEvicting, metav1.ConditionFalse)}, + true, + ), + Entry("Offboarded changes (False -> True)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeOffboarded, metav1.ConditionFalse)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeOffboarded, metav1.ConditionTrue)}, + true, + ), + Entry("HaEnabled changes (True -> False)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeHaEnabled, metav1.ConditionTrue)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeHaEnabled, metav1.ConditionFalse)}, + true, + ), + Entry("Onboarding changes (True -> False)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeOnboarding, metav1.ConditionTrue)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeOnboarding, metav1.ConditionFalse)}, + true, + ), + Entry("Evicting is unchanged (True -> True)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeEvicting, metav1.ConditionTrue)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeEvicting, metav1.ConditionTrue)}, + false, + ), + Entry("an uninspected condition changes (Ready False -> True)", + []metav1.Condition{makeCondition(kvmv1.ConditionTypeReady, metav1.ConditionFalse)}, + []metav1.Condition{makeCondition(kvmv1.ConditionTypeReady, metav1.ConditionTrue)}, + false, + ), + ) + }) })