Merge pull request kubernetes-sigs#2255 from k8s-infra-cherrypick-robot/cherry-pick-2254-to-release-0.11

k8s-ci-robot · web-flow · commit da57204dcd4b · 2024-11-14T15:16:51.000Z
[release-0.11] 🐛 Requeue when waiting for a server to be deleted
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -66,6 +66,7 @@ const (
 	waitForClusterInfrastructureReadyDuration = 15 * time.Second
 	waitForInstanceBecomeActiveToReconcile    = 60 * time.Second
 	waitForBuildingInstanceToReconcile        = 10 * time.Second
+	deleteServerRequeueDelay                  = 10 * time.Second
 )
 
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,verbs=get;list;watch;create;update;patch;delete
@@ -265,7 +266,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, scope
 		// If the server was found, we need to wait for it to be deleted before
 		// removing the OpenStackMachine finalizer.
 		scope.Logger().Info("Waiting for server to be deleted before removing finalizer")
-		return ctrl.Result{}, nil
+		return ctrl.Result{RequeueAfter: deleteServerRequeueDelay}, nil
 	}
 
 	controllerutil.RemoveFinalizer(openStackMachine, infrav1.MachineFinalizer)

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ const (`
`66`	`66`	`waitForClusterInfrastructureReadyDuration = 15 * time.Second`
`67`	`67`	`waitForInstanceBecomeActiveToReconcile = 60 * time.Second`
`68`	`68`	`waitForBuildingInstanceToReconcile = 10 * time.Second`
	`69`	`+ deleteServerRequeueDelay = 10 * time.Second`
`69`	`70`	`)`
`70`	`71`
`71`	`72`	`// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,verbs=get;list;watch;create;update;patch;delete`
`@@ -265,7 +266,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, scope`
`265`	`266`	`// If the server was found, we need to wait for it to be deleted before`
`266`	`267`	`// removing the OpenStackMachine finalizer.`
`267`	`268`	`scope.Logger().Info("Waiting for server to be deleted before removing finalizer")`
`268`		`- return ctrl.Result{}, nil`
	`269`	`+ return ctrl.Result{RequeueAfter: deleteServerRequeueDelay}, nil`
`269`	`270`	`}`
`270`	`271`
`271`	`272`	`controllerutil.RemoveFinalizer(openStackMachine, infrav1.MachineFinalizer)`