From 837c66ada3e36fa0291e111f0b2008135a47c3a7 Mon Sep 17 00:00:00 2001 From: Fabian Wiesel Date: Tue, 14 Oct 2025 11:41:18 +0200 Subject: [PATCH] Fix bug in cleanup: Only abort on error The code returns now if there hasn't been an error and the onboarding therefor doesn't continue. --- internal/controller/onboarding_controller.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/controller/onboarding_controller.go b/internal/controller/onboarding_controller.go index 342f60d8..113b25f5 100644 --- a/internal/controller/onboarding_controller.go +++ b/internal/controller/onboarding_controller.go @@ -314,10 +314,9 @@ func (r *OnboardingController) completeOnboarding(ctx context.Context, host stri for _, server := range serverList { log.Info("deleting server", "name", server.Name) err = servers.Delete(ctx, r.testComputeClient, server.ID).ExtractErr() - if gophercloud.ResponseCodeIs(err, http.StatusNotFound) { - continue + if err != nil && gophercloud.ResponseCodeIs(err, http.StatusNotFound) { + return ctrl.Result{}, err } - return ctrl.Result{}, err } aggs, err := aggregatesByName(ctx, r.computeClient)