Skip to content

Commit 922c712

Browse files
committed
linter fix
Signed-off-by: Ambika Nair <[email protected]>
1 parent b0f9ff8 commit 922c712

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

controllers/ibmobjectcsi_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
160160
}
161161

162162
// sync the resources which change over time
163-
csiControllerSyncer := clustersyncer.NewCSIControllerSyncer(r.Client, instance)
163+
csiControllerSyncer := clustersyncer.NewCSIControllerSyncer(r.Client, instance)
164164
if err := syncer.Sync(ctx, csiControllerSyncer, r.Recorder); err != nil {
165165
return reconcile.Result{}, err
166166
}

controllers/syncer/csi_node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type csiNodeSyncer struct {
4040
}
4141

4242
// NewCSINodeSyncer returns a syncer for CSI node
43-
func NewCSINodeSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Interface {
43+
func NewCSINodeSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Interface {
4444
obj := &appsv1.DaemonSet{
4545
ObjectMeta: metav1.ObjectMeta{
4646
Name: config.GetNameForResource(config.CSINode, driver.Name),

controllers/util/common/common.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func (ch *ControllerHelper) DeleteClusterRoleBindings(clusterRoleBindings []*rba
5050
logger.Error(err, "failed to delete ClusterRoleBinding", "Name", crb.GetName())
5151
return err
5252
}
53-
5453
}
5554
return nil
5655
}
@@ -66,11 +65,11 @@ func (ch *ControllerHelper) DeleteStorageClasses(storageClasses []*storagev1.Sto
6665
logger.Error(err, "failed to get StorageClasses", "Name", sc.GetName())
6766
return err
6867
}
69-
logger.Info("deleting StorageClasses", "Name", sc.GetName())
70-
if err := ch.Delete(context.TODO(), found); err != nil {
71-
logger.Error(err, "failed to delete StorageClasses", "Name", sc.GetName())
72-
return err
73-
}
68+
logger.Info("deleting StorageClasses", "Name", sc.GetName())
69+
if err := ch.Delete(context.TODO(), found); err != nil {
70+
logger.Error(err, "failed to delete StorageClasses", "Name", sc.GetName())
71+
return err
72+
}
7473
}
7574
return nil
7675
}
@@ -144,11 +143,11 @@ func (ch *ControllerHelper) DeleteClusterRoles(clusterRoles []*rbacv1.ClusterRol
144143
logger.Error(err, "failed to get ClusterRole", "Name", cr.GetName())
145144
return err
146145
}
147-
logger.Info("deleting ClusterRole", "Name", cr.GetName())
148-
if err := ch.Delete(context.TODO(), found); err != nil {
149-
logger.Error(err, "failed to delete ClusterRole", "Name", cr.GetName())
150-
return err
151-
}
146+
logger.Info("deleting ClusterRole", "Name", cr.GetName())
147+
if err := ch.Delete(context.TODO(), found); err != nil {
148+
logger.Error(err, "failed to delete ClusterRole", "Name", cr.GetName())
149+
return err
150+
}
152151
}
153152
return nil
154153
}

0 commit comments

Comments
 (0)