Latest linter fixes

Signed-off-by: Ambika Nair <[email protected]>

Author: ambiknai

controllers/ibmobjectcsi_controller.go

@@ -104,7 +104,7 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	// Fetch the CSIDriver instance
 	instance := crutils.New(&objectdriverv1alpha1.IBMObjectCSI{})
-	err := r.Get(context.TODO(), req.NamespacedName, instance.Unwrap())
+	err := r.Get(ctx, req.NamespacedName, instance.Unwrap())
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// Return and don't requeue
@@ -160,13 +160,13 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	// sync the resources which change over time
-	csiControllerSyncer := clustersyncer.NewCSIControllerSyncer(r.Client, r.Scheme, instance)
-	if err := syncer.Sync(context.TODO(), csiControllerSyncer, r.Recorder); err != nil {
+	csiControllerSyncer := clustersyncer.NewCSIControllerSyncer(r.Client,  instance)
+	if err := syncer.Sync(ctx, csiControllerSyncer, r.Recorder); err != nil {
 		return reconcile.Result{}, err
 	}
 
-	csiNodeSyncer := clustersyncer.NewCSINodeSyncer(r.Client, r.Scheme, instance)
-	if err := syncer.Sync(context.TODO(), csiNodeSyncer, r.Recorder); err != nil {
+	csiNodeSyncer := clustersyncer.NewCSINodeSyncer(r.Client, instance)
+	if err := syncer.Sync(ctx, csiNodeSyncer, r.Recorder); err != nil {
 		return reconcile.Result{}, err
 	}
 

controllers/recoverstalevolume_controller.go

@@ -249,7 +249,7 @@ func (r *RecoverStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.R
 					for _, podName := range podData {
 						reqLogger.Info("Pod using stale volume", "volume-name", volume, "pod-name", podName)
 
-						var zero int64 = 0
+						var zero int64
 						var deleteOptions = &client.DeleteOptions{GracePeriodSeconds: &zero}
 
 						pod := deploymentPods[podName]

controllers/syncer/csi_controller.go

@@ -39,7 +39,7 @@ type csiControllerSyncer struct {
 }
 
 // NewCSIControllerSyncer returns a syncer for CSI controller
-func NewCSIControllerSyncer(c client.Client, scheme *runtime.Scheme, driver *crutils.IBMObjectCSI) syncer.Interface {
+func NewCSIControllerSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Interface {
 	obj := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        config.GetNameForResource(config.CSIController, driver.Name),

controllers/syncer/csi_node.go

@@ -40,7 +40,7 @@ type csiNodeSyncer struct {
 }
 
 // NewCSINodeSyncer returns a syncer for CSI node
-func NewCSINodeSyncer(c client.Client, scheme *runtime.Scheme, driver *crutils.IBMObjectCSI) syncer.Interface {
+func NewCSINodeSyncer(c client.Client,  driver *crutils.IBMObjectCSI) syncer.Interface {
 	obj := &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        config.GetNameForResource(config.CSINode, driver.Name),

controllers/util/common/common.go

@@ -43,13 +43,14 @@ func (ch *ControllerHelper) DeleteClusterRoleBindings(clusterRoleBindings []*rba
 		} else if err != nil {
 			logger.Error(err, "failed to get ClusterRoleBinding", "Name", crb.GetName())
 			return err
-		} else {
-			logger.Info("deleting ClusterRoleBinding", "Name", crb.GetName())
-			if err := ch.Delete(context.TODO(), found); err != nil {
-				logger.Error(err, "failed to delete ClusterRoleBinding", "Name", crb.GetName())
-				return err
-			}
 		}
+
+		logger.Info("deleting ClusterRoleBinding", "Name", crb.GetName())
+		if err := ch.Delete(context.TODO(), found); err != nil {
+			logger.Error(err, "failed to delete ClusterRoleBinding", "Name", crb.GetName())
+			return err
+		}
+
 	}
 	return nil
 }
@@ -64,13 +65,12 @@ func (ch *ControllerHelper) DeleteStorageClasses(storageClasses []*storagev1.Sto
 		} else if err != nil {
 			logger.Error(err, "failed to get StorageClasses", "Name", sc.GetName())
 			return err
-		} else {
+		}
 			logger.Info("deleting StorageClasses", "Name", sc.GetName())
 			if err := ch.Delete(context.TODO(), found); err != nil {
 				logger.Error(err, "failed to delete StorageClasses", "Name", sc.GetName())
 				return err
 			}
-		}
 	}
 	return nil
 }
@@ -143,13 +143,12 @@ func (ch *ControllerHelper) DeleteClusterRoles(clusterRoles []*rbacv1.ClusterRol
 		} else if err != nil {
 			logger.Error(err, "failed to get ClusterRole", "Name", cr.GetName())
 			return err
-		} else {
+		}
 			logger.Info("deleting ClusterRole", "Name", cr.GetName())
 			if err := ch.Delete(context.TODO(), found); err != nil {
 				logger.Error(err, "failed to delete ClusterRole", "Name", cr.GetName())
 				return err
 			}
-		}
 	}
 	return nil
 }