From 727a546d1f4a53e40fbd82a3112b5b5bbe69e3a1 Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Thu, 14 Nov 2024 13:55:28 +0200 Subject: [PATCH 1/2] Requeue when waiting for a server to be deleted Signed-off-by: Lennart Jern --- controllers/openstackmachine_controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go index 6c8f3c0a2a..3de18d0dc5 100644 --- 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) From aa2f4fb2fbd408bcbc5973adc17feb2602283fdb Mon Sep 17 00:00:00 2001 From: shiftstack-merge-bot Date: Thu, 14 Nov 2024 16:39:53 +0000 Subject: [PATCH 2/2] CARRY: running make merge-bot --- .../controllers/openstackmachine_controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackmachine_controller.go b/hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackmachine_controller.go index 6c8f3c0a2a..3de18d0dc5 100644 --- a/hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/controllers/openstackmachine_controller.go +++ b/hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/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)