More linter corrections

Author: fwiesel

internal/controller/aggregates_controller.go

@@ -89,15 +89,15 @@ func (r *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)
 
 	if len(toRemove) > 0 {
 		log.Info("Removing", "aggregates", toRemove)
-		for item, _ := range toRemove {
+		for item := range toRemove {
 			err = removeFromAggregate(ctx, r.computeClient, aggs, computeHost, item)
 			if err != nil {
 				return ctrl.Result{}, err
 			}
 		}
 	}
 
-	_, err = setNodeAnnotations(ctx, r.Client, node, map[string]string{annotationAggregatesApplied: node.Annotations[annotationAggregates]})
+	err = setNodeAnnotations(ctx, r.Client, node, map[string]string{annotationAggregatesApplied: node.Annotations[annotationAggregates]})
 
 	return ctrl.Result{}, err
 }

internal/controller/decomission_controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("Decommission Controller", func() {
 			resource := &corev1.Node{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   nodeName,
-					Labels: map[string]string{labelEvictionRequired: "true"},
+					Labels: map[string]string{labelEvictionRequired: "true"}, //nolint:goconst
 				},
 			}
 			Expect(k8sClient.Create(ctx, resource)).To(Succeed())

internal/controller/maintenance_controller.go

@@ -176,7 +176,7 @@ func (r *MaintenanceController) ensureSignallingDeployment(ctx context.Context,
 		deployment.Labels = labels
 
 		podLabels := maps.Clone(labels)
-		podLabels[labelCriticalComponent] = "true"
+		podLabels[labelCriticalComponent] = "true" //nolint:goconst
 
 		var command []string
 		if ready {

internal/controller/maintenance_controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("Maintenance Controller", func() {
 			resource := &corev1.Node{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   nodeName,
-					Labels: map[string]string{labelEvictionRequired: "true"},
+					Labels: map[string]string{labelEvictionRequired: "true"}, //nolint:goconst
 				},
 			}
 			Expect(k8sClient.Create(ctx, resource)).To(Succeed())

internal/controller/node_certificate_controller.go

@@ -35,8 +35,6 @@ import (
 	logger "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-const ()
-
 type NodeCertificateController struct {
 	k8sclient.Client
 	Scheme     *runtime.Scheme

internal/controller/node_eviction_label_controller.go

@@ -91,7 +91,7 @@ func (r *NodeEvictionLabelReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	var value string
 	if _, onboarding := node.Labels[labelOnboardingState]; !onboarding {
-		value = "true"
+		value = "true" //nolint:goconst
 	} else {
 		// check for existing eviction, else create it
 		value, err = r.reconcileEviction(ctx, eviction, node, hostname, maintenanceValue)
@@ -102,7 +102,7 @@ func (r *NodeEvictionLabelReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	if value != "" {
 		newNode := node.DeepCopy()
-		if value == "true" {
+		if value == "true" { //nolint:goconst
 			evictAgentsLabels(newNode.Labels)
 		}
 		newNode.Labels[labelEvictionApproved] = maintenanceValue
@@ -136,7 +136,7 @@ func (r *NodeEvictionLabelReconciler) reconcileEviction(ctx context.Context, evi
 	// check if the eviction is already succeeded
 	switch eviction.Status.EvictionState {
 	case "Succeeded":
-		return "true", nil
+		return "true", nil //nolint:goconst
 	case "Failed":
 		return "false", nil
 	default:

internal/controller/onboarding_controller.go

@@ -324,6 +324,10 @@ func (r *OnboardingController) createOrGetTestServer(ctx context.Context, zone,
 	}
 
 	imagesList, err := images.ExtractImages(imagePages)
+	if err != nil {
+		return nil, err
+	}
+
 	for _, image := range imagesList {
 		if image.Name == testImageName {
 			imageRef = image.ID
@@ -362,23 +366,19 @@ func (r *OnboardingController) createOrGetTestServer(ctx context.Context, zone,
 		Name:             serverName,
 		AvailabilityZone: fmt.Sprintf("%v:%v", zone, computeHost),
 		FlavorRef:        flavorRef,
-		BlockDevice: []servers.BlockDevice{
-			servers.BlockDevice{
-				UUID:                imageRef,
-				BootIndex:           0,
-				SourceType:          "image",
-				VolumeSize:          64,
-				DiskBus:             "virtio",
-				DeleteOnTermination: true,
-				DestinationType:     "volume",
-				VolumeType:          testVolumeType,
-			},
-		},
-		Networks: []servers.Network{
-			servers.Network{
-				UUID: networkRef,
-			},
-		},
+		BlockDevice: []servers.BlockDevice{{
+			UUID:                imageRef,
+			BootIndex:           0,
+			SourceType:          "image",
+			VolumeSize:          64,
+			DiskBus:             "virtio",
+			DeleteOnTermination: true,
+			DestinationType:     "volume",
+			VolumeType:          testVolumeType,
+		}},
+		Networks: []servers.Network{{
+			UUID: networkRef,
+		}},
 	}, nil).Extract()
 
 	if err != nil {

internal/controller/onboarding_controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("Onboarding Controller", func() {
 			resource := &corev1.Node{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:   nodeName,
-					Labels: map[string]string{labelEvictionRequired: "true"},
+					Labels: map[string]string{labelEvictionRequired: "true"}, //nolint:goconst
 				},
 			}
 			Expect(k8sClient.Create(ctx, resource)).To(Succeed())

internal/controller/traits_controller.go

@@ -91,7 +91,7 @@ func (r *TraitsController) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		}
 	}
 
-	for item, _ := range toAdd {
+	for item := range toAdd {
 		targetTraitsSet[item] = true
 	}
 
@@ -107,7 +107,7 @@ func (r *TraitsController) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, result.Err
 	}
 
-	_, err = setNodeAnnotations(ctx, r.Client, node, map[string]string{annotationAppliedCustomTraits: node.Annotations[annotationCustomTraits]})
+	err = setNodeAnnotations(ctx, r.Client, node, map[string]string{annotationAppliedCustomTraits: node.Annotations[annotationCustomTraits]})
 
 	return ctrl.Result{}, err
 }
@@ -142,7 +142,7 @@ func extractTraits(node *corev1.Node, key string) (values map[string]bool) {
 // returns all elements in b not in a
 func difference(a, b map[string]bool) (diff map[string]bool) {
 	diff = make(map[string]bool, 0)
-	for item, _ := range b {
+	for item := range b {
 		_, found := a[item]
 		if !found {
 			diff[item] = true