golangci-lint fixes

Signed-off-by: mluffman <mluffman@thoughtmachine.net>

Author: mluffman

Makefile

@@ -70,6 +70,9 @@ fmt:
 vet:
 	go vet ./...
 
+lint: golangci-lint
+	$(GOLANGCI_LINT) run
+
 # Generate code
 generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -207,8 +210,6 @@ kind: $(KIND) ## Download golangci-lint locally if necessary.
 $(KIND): $(LOCALBIN)
 	$(call go-install-tool,$(KIND),sigs.k8s.io/kind,${KIND_VERSION})
 
-
-
 .PHONY: kuttl
 kuttl: $(KUTTL) ## Download kuttl locally if necessary.
 $(KUTTL): $(LOCALBIN)

pkg/controllers/rediscluster/rediscluster_controller.go

@@ -195,27 +195,27 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 	if int(totalReplicas) > 1 && unhealthyNodeCount >= int(totalReplicas)-1 {
 		reqLogger.Info("healthy leader count does not match desired; attempting to repair disconnected masters")
-		if err := k8sutils.RepairDisconnectedMasters(ctx, r.K8sClient, r.Log, instance); err != nil {
+		if err = k8sutils.RepairDisconnectedMasters(ctx, r.K8sClient, r.Log, instance); err != nil {
 			reqLogger.Error(err, "failed to repair disconnected masters")
 		}
 
-		err := retry.Do(func() error {
-			unhealthyNodeCount, err := k8sutils.UnhealthyNodesInCluster(ctx, r.K8sClient, r.Log, instance)
-			if err != nil {
-				return err
+		err = retry.Do(func() error {
+			nc, nErr := k8sutils.UnhealthyNodesInCluster(ctx, r.K8sClient, r.Log, instance)
+			if nErr != nil {
+				return nErr
 			}
-			if unhealthyNodeCount == 0 {
+			if nc == 0 {
 				return nil
 			}
-			return fmt.Errorf("%d unhealthy nodes", unhealthyNodeCount)
+			return fmt.Errorf("%d unhealthy nodes", nc)
 		}, retry.Attempts(3), retry.Delay(time.Second*5))
 
 		if err == nil {
 			reqLogger.Info("repairing unhealthy masters successful, no unhealthy masters left")
 			return intctrlutil.RequeueAfter(reqLogger, time.Second*30, "no unhealthy nodes found after repairing disconnected masters")
 		}
 		reqLogger.Info("unhealthy nodes exist after attempting to repair disconnected masters; starting failover")
-		if err := k8sutils.ExecuteFailoverOperation(ctx, r.K8sClient, r.Log, instance); err != nil {
+		if err = k8sutils.ExecuteFailoverOperation(ctx, r.K8sClient, r.Log, instance); err != nil {
 			return intctrlutil.RequeueWithError(err, reqLogger, "")
 		}
 	}