Skip to content
Merged
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
10 changes: 5 additions & 5 deletions internal/controller/hypervisor_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@ func (hv *HypervisorController) Reconcile(ctx context.Context, req ctrl.Request)
nodeTerminationCondition := FindNodeStatusCondition(node.Status.Conditions, "Terminating")
if nodeTerminationCondition != nil && nodeTerminationCondition.Status == corev1.ConditionTrue {
// Node might be terminating, propagate condition to hypervisor
meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
changed := meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
Type: kvmv1.ConditionTypeReady,
Status: metav1.ConditionFalse,
Reason: nodeTerminationCondition.Reason,
Message: nodeTerminationCondition.Message,
})
meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
}) || meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
Type: kvmv1.ConditionTypeTerminating,
Status: metav1.ConditionStatus(nodeTerminationCondition.Status),
Reason: nodeTerminationCondition.Reason,
Message: nodeTerminationCondition.Message,
})
return ctrl.Result{}, hv.Status().Update(ctx, hypervisor)
if changed {
return ctrl.Result{}, hv.Status().Update(ctx, hypervisor)
}
}

return ctrl.Result{}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/hypervisor_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ var _ = Describe("Hypervisor Controller", func() {
Expect(k8sClient.Status().Update(ctx, resource)).To(Succeed())

By("Reconciling the created resource")
for i := 0; i < 2; i++ {
for i := 0; i < 3; i++ {
_, err := hypervisorController.Reconcile(ctx, ctrl.Request{
NamespacedName: types.NamespacedName{Name: resource.Name},
})
Expand Down
Loading