Skip to content

Commit 7d007e3

Browse files
committed
Update Ready State when Offboarded
One rarely sees it, but if offboarding is completed and the hypervisor doesn't get deleted one only sees ScaleDown and that makes it harder to narrow down where it is stuck.
1 parent 437bc71 commit 7d007e3

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

internal/controller/decomission_controller.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ func (r *NodeDecommissionReconciler) markOffboarded(ctx context.Context, hv *kvm
175175
Reason: "Offboarded",
176176
Message: "Offboarding successful",
177177
})
178+
meta.SetStatusCondition(&hv.Status.Conditions, metav1.Condition{
179+
Type: kvmv1.ConditionTypeReady,
180+
Status: metav1.ConditionFalse,
181+
Reason: "Offboarded",
182+
Message: "Offboarding successful",
183+
})
178184
if err := r.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base,
179185
k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(DecommissionControllerName)); err != nil {
180186
return fmt.Errorf("cannot update hypervisor status due to %w", err)

internal/controller/decomission_controller_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,18 @@ var _ = Describe("Decommission Controller", func() {
242242

243243
hypervisor := &kvmv1.Hypervisor{}
244244
Expect(k8sClient.Get(ctx, resourceName, hypervisor)).To(Succeed())
245-
Expect(hypervisor.Status.Conditions).To(ContainElement(
245+
Expect(hypervisor.Status.Conditions).To(ContainElements(
246246
SatisfyAll(
247247
HaveField("Type", kvmv1.ConditionTypeOffboarded),
248248
HaveField("Status", metav1.ConditionTrue),
249+
HaveField("Reason", "Offboarded"),
250+
HaveField("Message", "Offboarding successful"),
251+
),
252+
SatisfyAll(
253+
HaveField("Type", kvmv1.ConditionTypeReady),
254+
HaveField("Status", metav1.ConditionFalse),
255+
HaveField("Reason", "Offboarded"),
256+
HaveField("Message", "Offboarding successful"),
249257
),
250258
))
251259
})

0 commit comments

Comments
 (0)