Skip to content

test: make ImpVM deletion deadlines deterministic #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syscod3 merged 1 commit into from
Sep 11, 2026
Merged

test: make ImpVM deletion deadlines deterministic #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion internal/controller/impvm_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@ type ImpVMReconciler struct {
client.Client
Scheme *runtime.Scheme
Recorder record.EventRecorder
// Now is an optional clock for deadline evaluation. Production uses time.Now.
Now func() time.Time
}

func (r *ImpVMReconciler) now() time.Time {
if r.Now != nil {
return r.Now()
}
return time.Now()
}

// +kubebuilder:rbac:groups=imp.dev,resources=impvms,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -368,7 +377,7 @@ func (r *ImpVMReconciler) handleDeletion(ctx context.Context, vm *impdevv1alpha1

// Check for termination timeout.
deadline := vm.DeletionTimestamp.Add(terminationTimeout)
if time.Now().After(deadline) {
if r.now().After(deadline) {
r.Recorder.Event(vm, corev1.EventTypeWarning, EventReasonTerminationTimeout,
"Finalizer force-removed after 2min termination timeout")
patch := client.MergeFrom(vm.DeepCopy())
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/impvm_coverage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,6 @@ var _ = Describe("ImpVM handleDeletion with nodeName", func() {
})

It("force-removes finalizer after termination timeout", func() {
origTimeout := terminationTimeout
terminationTimeout = 0 // trigger immediately
DeferCleanup(func() { terminationTimeout = origTimeout })

vm := &impdevv1alpha1.ImpVM{
ObjectMeta: metav1.ObjectMeta{
Name: "del-timeout",
Expand All @@ -581,7 +577,11 @@ var _ = Describe("ImpVM handleDeletion with nodeName", func() {
Expect(k8sClient.Create(ctx, vm)).To(Succeed())
Expect(k8sClient.Delete(ctx, vm)).To(Succeed())

_, err := newReconciler().Reconcile(ctx, reconcile.Request{
deleting := &impdevv1alpha1.ImpVM{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Name: "del-timeout", Namespace: "default"}, deleting)).To(Succeed())
r := newReconciler()
r.Now = func() time.Time { return deleting.DeletionTimestamp.Add(terminationTimeout).Add(time.Nanosecond) }
_, err := r.Reconcile(ctx, reconcile.Request{
NamespacedName: types.NamespacedName{Name: "del-timeout", Namespace: "default"},
})
Expect(err).NotTo(HaveOccurred())
Expand Down
Loading