bump golangci-lint to v1.63.4, and fix findings

Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

.github/workflows/test.yaml

@@ -54,7 +54,7 @@ jobs:
       uses: golangci/golangci-lint-action@v6
       with:
         args: --timeout=5m -v
-        version: v1.59.0
+        version: v1.63.4
 
   check-gen:
     runs-on: ubuntu-latest

Makefile

@@ -340,7 +340,7 @@ goimports:
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
 golangci-lint: ## Download golangci-lint locally if necessary.
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2)
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4)
 
 .PHONY: linter
 linter: golangci-lint

controllers/kubevirtcluster_controller.go

@@ -165,7 +165,7 @@ func (r *KubevirtClusterReconciler) reconcileNormal(ctx *context.ClusterContext,
 	// Create the service serving as load balancer, if not existing
 	if !externalLoadBalancer.IsFound() {
 		if err := externalLoadBalancer.Create(ctx); err != nil {
-			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
+			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, "%v", err.Error())
 			return ctrl.Result{}, errors.Wrap(err, "failed to create load balancer")
 		}
 	}
@@ -180,7 +180,7 @@ func (r *KubevirtClusterReconciler) reconcileNormal(ctx *context.ClusterContext,
 	} else if ctx.KubevirtCluster.Spec.ControlPlaneServiceTemplate.Spec.Type == "LoadBalancer" {
 		lbip4, err := externalLoadBalancer.ExternalIP(ctx)
 		if err != nil {
-			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
+			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, "%v", err.Error())
 			return ctrl.Result{}, errors.Wrap(err, "failed to get ExternalIP for the load balancer")
 		}
 		ctx.KubevirtCluster.Spec.ControlPlaneEndpoint = infrav1.APIEndpoint{
@@ -192,7 +192,7 @@ func (r *KubevirtClusterReconciler) reconcileNormal(ctx *context.ClusterContext,
 	} else {
 		lbip4, err := externalLoadBalancer.IP(ctx)
 		if err != nil {
-			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
+			conditions.MarkFalse(ctx.KubevirtCluster, infrav1.LoadBalancerAvailableCondition, infrav1.LoadBalancerProvisioningFailedReason, clusterv1.ConditionSeverityWarning, "%v", err.Error())
 			return ctrl.Result{}, errors.Wrap(err, "failed to get ClusterIP for the load balancer")
 		}
 		ctx.KubevirtCluster.Spec.ControlPlaneEndpoint = infrav1.APIEndpoint{

controllers/kubevirtmachine_controller.go

@@ -265,7 +265,7 @@ func (r *KubevirtMachineReconciler) reconcileNormal(ctx *context.MachineContext)
 	if !isTerminal && !externalMachine.Exists() {
 		ctx.KubevirtMachine.Status.Ready = false
 		if err := externalMachine.Create(ctx.Context); err != nil {
-			conditions.MarkFalse(ctx.KubevirtMachine, infrav1.VMProvisionedCondition, infrav1.VMCreateFailedReason, clusterv1.ConditionSeverityError, fmt.Sprintf("Failed vm creation: %v", err))
+			conditions.MarkFalse(ctx.KubevirtMachine, infrav1.VMProvisionedCondition, infrav1.VMCreateFailedReason, clusterv1.ConditionSeverityError, "Failed vm creation: %v", err)
 			return ctrl.Result{}, errors.Wrap(err, "failed to create VM instance")
 		}
 		ctx.Logger.Info("VM Created, waiting on vm to be provisioned.")
@@ -278,7 +278,7 @@ func (r *KubevirtMachineReconciler) reconcileNormal(ctx *context.MachineContext)
 		conditions.MarkTrue(ctx.KubevirtMachine, infrav1.VMProvisionedCondition)
 	} else {
 		reason, message := externalMachine.GetVMNotReadyReason()
-		conditions.MarkFalse(ctx.KubevirtMachine, infrav1.VMProvisionedCondition, reason, clusterv1.ConditionSeverityInfo, message)
+		conditions.MarkFalse(ctx.KubevirtMachine, infrav1.VMProvisionedCondition, reason, clusterv1.ConditionSeverityInfo, "%s", message)
 
 		// Waiting for VM to boot
 		ctx.KubevirtMachine.Status.Ready = false
@@ -371,7 +371,7 @@ func (r *KubevirtMachineReconciler) reconcileNormal(ctx *context.MachineContext)
 		conditions.MarkTrue(ctx.KubevirtMachine, infrav1.VMLiveMigratableCondition)
 	} else {
 		conditions.MarkFalse(ctx.KubevirtMachine, infrav1.VMLiveMigratableCondition, reason, clusterv1.ConditionSeverityInfo,
-			fmt.Sprintf("%s is not a live migratable machine: %s", ctx.KubevirtMachine.Name, message))
+			"%s is not a live migratable machine: %s", ctx.KubevirtMachine.Name, message)
 	}
 
 	return ctrl.Result{}, nil

e2e/common_test.go

@@ -30,7 +30,7 @@ func DeleteAndWait(ctx context.Context, k8sclient client.Client, obj client.Obje
 			}
 		}
 		return fmt.Errorf("waiting on object %s to be deleted", key)
-	}, time.Duration(timeoutSeconds)*time.Second, 1*time.Second).Should(BeNil())
+	}, time.Duration(timeoutSeconds)*time.Second, 1*time.Second).Should(Succeed())
 }
 
 // RunCmd function executes a command, and returns STDOUT and STDERR bytes

e2e/create-cluster_test.go

@@ -449,7 +449,7 @@ var _ = Describe("CreateCluster", func() {
 			}
 
 			return fmt.Errorf("waiting on object %s to be deleted", key)
-		}, time.Duration(timeoutSeconds)*time.Second, 1*time.Second).Should(BeNil())
+		}, time.Duration(timeoutSeconds)*time.Second, 1*time.Second).Should(Succeed())
 
 	}