Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions internal/controller/gardener_node_lifecycle_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand All @@ -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 {
Expand All @@ -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
Expand Down
75 changes: 75 additions & 0 deletions internal/controller/gardener_node_lifecycle_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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,
),
)
})
})
Loading