Return errors, remove unused return value

Author: fwiesel

internal/controller/onboarding_controller.go

@@ -211,7 +211,7 @@ func (r *OnboardingController) completeOnboarding(ctx context.Context, host stri
 	_, err = setNodeLabels(ctx, r, node, map[string]string{
 		labelOnboardingState: onboardingValueCompleted,
 	})
-	return ctrl.Result{}, nil
+	return ctrl.Result{}, err
 }
 
 func (r *OnboardingController) ensureNovaLabels(ctx context.Context, node *corev1.Node) (ctrl.Result, bool, error) {

internal/controller/utils.go

@@ -73,12 +73,12 @@ func hasAnyLabel(labels map[string]string, list ...string) bool {
 }
 
 // setNodeAnnotations sets annotations on the node.
-func setNodeAnnotations(ctx context.Context, writer client.Writer, node *corev1.Node, annotations map[string]string) (bool, error) {
+func setNodeAnnotations(ctx context.Context, writer client.Writer, node *corev1.Node, annotations map[string]string) error {
 	newNode := node.DeepCopy()
 	maps.Copy(newNode.Annotations, annotations)
 	if maps.Equal(node.Annotations, newNode.Annotations) {
-		return false, nil
+		return nil
 	}
 
-	return true, writer.Patch(ctx, newNode, client.MergeFrom(node))
+	return writer.Patch(ctx, newNode, client.MergeFrom(node))
 }