Skip to content

MGMT-10006: Wait for host to deprovision in BMAC #6666

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
openshift-merge-bot merged 1 commit into from
Aug 15, 2024
Merged

MGMT-10006: Wait for host to deprovision in BMAC #6666

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
12 changes: 2 additions & 10 deletions internal/controller/controllers/agent_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import (

const (
AgentFinalizerName = "agent." + aiv1beta1.Group + "/ai-deprovision"
AgentSpokeCleanupAnnotation = "agent." + aiv1beta1.Group + "/clean-spoke-on-delete"
BaseLabelPrefix = aiv1beta1.Group + "/"
InventoryLabelPrefix = "inventory." + BaseLabelPrefix
AgentLabelHasNonrotationalDisk = InventoryLabelPrefix + "storage-hasnonrotationaldisk"
Expand Down Expand Up @@ -398,16 +399,7 @@ func (r *AgentReconciler) handleAgentFinalizer(ctx context.Context, log logrus.F
}
} else { // agent is being deleted
if funk.ContainsString(agent.GetFinalizers(), AgentFinalizerName) {
if _, has_annotation := agent.GetAnnotations()[BMH_FINALIZER_NAME]; has_annotation && agent.Spec.ClusterDeploymentName != nil {
// wait for BMH to be deleted
if foundBMH, err := r.bmhExists(ctx, agent); err != nil || foundBMH {
if err != nil {
log.WithError(err).Warnf("failed to determine if BMH exists for agent")
}
log.Info("waiting for BMH to be deleted")
return &ctrl.Result{RequeueAfter: defaultRequeueAfterOnError}, err
}

if _, has_annotation := agent.GetAnnotations()[AgentSpokeCleanupAnnotation]; has_annotation && agent.Spec.ClusterDeploymentName != nil {
// only remove the spoke resources if the entire cluster isn't being deleted
clusterExists, err := r.clusterExists(ctx, agent)
if err != nil {
Expand Down
Loading