Skip to content

ACM-27859: Allow PreprovisioningImage finalizer to be removed once BMH finishes deprovisioning #8604

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

Open
CrystalChun wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −4
Open

ACM-27859: Allow PreprovisioningImage finalizer to be removed once BMH finishes deprovisioning #8604

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
17 changes: 13 additions & 4 deletions internal/controller/controllers/preprovisioningimage_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,11 +769,20 @@ func (r *PreprovisioningImageReconciler) handlePreprovisioningImageDeletion(ctx
return ctrl.Result{RequeueAfter: longerRequeueAfterOnError}, err
}

// PreprovisioningImage should wait for a BMH with automated cleaning enabled to be deleted
// PreprovisioningImage should wait for a BMH with automated cleaning enabled to be deleted or finish deprovisioning
if bmh.Spec.AutomatedCleaningMode != metal3_v1alpha1.CleaningModeDisabled {
log.Infof("Cannot delete PreprovisioningImage yet: BMH %s/%s with automatedCleaningMode=%s exists and requires the image for deprovisioning",
bmh.Namespace, bmh.Name, bmh.Spec.AutomatedCleaningMode)
return ctrl.Result{Requeue: true}, nil
if bmh.DeletionTimestamp.IsZero() {
log.Infof("Cannot delete PreprovisioningImage yet: BMH %s/%s with automatedCleaningMode=%s is not being deleted",
bmh.Namespace, bmh.Name, bmh.Spec.AutomatedCleaningMode)
return ctrl.Result{Requeue: true}, nil
}
// already deprovisioned is true when the BMH is either in state powering off before delete or deleting
alreadyDeprovisioned := funk.Contains([]metal3_v1alpha1.ProvisioningState{metal3_v1alpha1.StatePoweringOffBeforeDelete, metal3_v1alpha1.StateDeleting}, bmh.Status.Provisioning.State)
if !alreadyDeprovisioned {
log.Infof("Cannot delete PreprovisioningImage yet: BMH %s/%s with automatedCleaningMode=%s has not finished deprovisioning yet. Current state: %s",
bmh.Namespace, bmh.Name, bmh.Spec.AutomatedCleaningMode, bmh.Status.Provisioning.State)
return ctrl.Result{Requeue: true}, nil
}
}

// Safe to delete, remove finalizer
Expand Down
41 changes: 41 additions & 0 deletions internal/controller/controllers/preprovisioningimage_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,7 @@ var _ = Describe("PreprovisioningImage deletion protection", func() {

// UpdateBMH to set metadata cleaning enabled
bmh.Spec.AutomatedCleaningMode = metal3_v1alpha1.CleaningModeMetadata
bmh.Status.Provisioning.State = metal3_v1alpha1.StateDeprovisioning
bmh.Finalizers = []string{"arbitraryfinalizer"}
Expect(c.Update(ctx, bmh)).To(Succeed())
// Set BMH to be deleting
Expand Down Expand Up @@ -1401,6 +1402,46 @@ var _ = Describe("PreprovisioningImage deletion protection", func() {
Expect(k8serrors.IsNotFound(c.Get(ctx, key, ppi))).To(BeTrue())
})

It("allows deletion when BMH finished deprovisioning with state deleting", func() {
Expect(c.Create(ctx, ppi)).To(Succeed())
// Delete ppi
Expect(c.Delete(ctx, ppi)).To(Succeed())
// Set BMH to be deleting
bmh.Spec.AutomatedCleaningMode = metal3_v1alpha1.CleaningModeMetadata
bmh.Status.Provisioning.State = metal3_v1alpha1.StateDeleting
Expect(c.Update(ctx, bmh)).To(Succeed())
Expect(c.Delete(ctx, bmh)).To(Succeed())

result, err := pr.Reconcile(ctx, newPreprovisioningImageRequest(ppi))

Expect(err).To(BeNil())
Expect(result).To(Equal(ctrl.Result{}))

// Verify ppi was deleted
key := types.NamespacedName{Name: ppi.Name, Namespace: ppi.Namespace}
Expect(k8serrors.IsNotFound(c.Get(ctx, key, ppi))).To(BeTrue())
})

It("allows deletion when BMH finished deprovisioning with state powering off before delete", func() {
Expect(c.Create(ctx, ppi)).To(Succeed())
// Delete ppi
Expect(c.Delete(ctx, ppi)).To(Succeed())
// Set BMH to be deleting
bmh.Spec.AutomatedCleaningMode = metal3_v1alpha1.CleaningModeMetadata
bmh.Status.Provisioning.State = metal3_v1alpha1.StatePoweringOffBeforeDelete
Expect(c.Update(ctx, bmh)).To(Succeed())
Expect(c.Delete(ctx, bmh)).To(Succeed())

result, err := pr.Reconcile(ctx, newPreprovisioningImageRequest(ppi))

Expect(err).To(BeNil())
Expect(result).To(Equal(ctrl.Result{}))

// Verify ppi was deleted
key := types.NamespacedName{Name: ppi.Name, Namespace: ppi.Namespace}
Expect(k8serrors.IsNotFound(c.Get(ctx, key, ppi))).To(BeTrue())
})

It("blocks deletion when BMH has metadata cleaning enabled but is NOT being deleted", func() {
Expect(c.Create(ctx, ppi)).To(Succeed())
// Delete ppi
Expand Down