Fix bug in cleanup: Only abort on error

fwiesel · fwiesel · commit d431a06366a1 · 2025-10-14T11:51:58.000+02:00
The code returns now if there hasn't been an error
and the onboarding therefor doesn't continue.
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -314,10 +314,9 @@ func (r *OnboardingController) completeOnboarding(ctx context.Context, host stri`
`314`	`314`	`for _, server := range serverList {`
`315`	`315`	`log.Info("deleting server", "name", server.Name)`
`316`	`316`	`err = servers.Delete(ctx, r.testComputeClient, server.ID).ExtractErr()`
`317`		`- if gophercloud.ResponseCodeIs(err, http.StatusNotFound) {`
`318`		`- continue`
	`317`	`+ if err != nil && gophercloud.ResponseCodeIs(err, http.StatusNotFound) {`
	`318`	`+ return ctrl.Result{}, err`
`319`	`319`	`}`
`320`		`- return ctrl.Result{}, err`
`321`	`320`	`}`
`322`	`321`
`323`	`322`	`aggs, err := aggregatesByName(ctx, r.computeClient)`