Fix linter issue

netobserv · Aug 24, 2023 · c51cbea · c51cbea
1 parent 99ee681
commit c51cbea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/consoleplugin/consoleplugin_test.go b/controllers/consoleplugin/consoleplugin_test.go
@@ -379,7 +379,7 @@ func TestDashboardsPerOCPVersion(t *testing.T) {
 	}, dashboards)
 
 	// 4.14 introduces new dashboards; check exact version
-	r.ClusterInfo.SetOpenShiftVersion("4.14.0")
+	r.ClusterInfo.SetOpenShiftVersion("4.15.0")
 	dashboards = r.getAvailableDashboards(context.Background())
 	sort.Strings(dashboards)
 	assert.Equal(t, []string{
@@ -392,7 +392,7 @@ func TestDashboardsPerOCPVersion(t *testing.T) {
 	}, dashboards)
 
 	// Check future versions
-	r.ClusterInfo.SetOpenShiftVersion("4.14.5")
+	r.ClusterInfo.SetOpenShiftVersion("4.15.5")
 	dashboards = r.getAvailableDashboards(context.Background())
 	sort.Strings(dashboards)
 	assert.Equal(t, []string{

diff --git a/controllers/flowcollector_controller.go b/controllers/flowcollector_controller.go
@@ -103,7 +103,7 @@ func (r *FlowCollectorReconciler) Reconcile(ctx context.Context, _ ctrl.Request)
 
 	var didChange, isInProgress bool
 	previousNamespace := desired.Status.Namespace
-	reconcilersInfo := r.newCommonInfo(ctx, desired, ns, previousNamespace, func(b bool) { didChange = b }, func(b bool) { isInProgress = b })
+	reconcilersInfo := r.newCommonInfo(desired, ns, previousNamespace, func(b bool) { didChange = b }, func(b bool) { isInProgress = b })
 
 	err = r.reconcileOperator(ctx, &reconcilersInfo, desired)
 	if err != nil {
@@ -357,7 +357,7 @@ func (r *FlowCollectorReconciler) checkFinalizer(ctx context.Context, desired *f
 func (r *FlowCollectorReconciler) finalize(ctx context.Context, desired *flowslatest.FlowCollector) error {
 	if !r.clusterInfo.HasCNO() {
 		ns := getNamespaceName(desired)
-		info := r.newCommonInfo(ctx, desired, ns, ns, func(b bool) {}, func(b bool) {})
+		info := r.newCommonInfo(desired, ns, ns, func(b bool) {}, func(b bool) {})
 		ovsConfigController := ovs.NewFlowsConfigOVNKController(&info, desired.Spec.Agent.IPFIX.OVNKubernetes)
 		if err := ovsConfigController.Finalize(ctx, desired); err != nil {
 			return fmt.Errorf("failed to finalize ovn-kubernetes reconciler: %w", err)
@@ -366,7 +366,7 @@ func (r *FlowCollectorReconciler) finalize(ctx context.Context, desired *flowsla
 	return nil
 }
 
-func (r *FlowCollectorReconciler) newCommonInfo(ctx context.Context, desired *flowslatest.FlowCollector, ns, prevNs string, changeHook, inProgressHook func(bool)) reconcilers.Common {
+func (r *FlowCollectorReconciler) newCommonInfo(desired *flowslatest.FlowCollector, ns, prevNs string, changeHook, inProgressHook func(bool)) reconcilers.Common {
 	return reconcilers.Common{
 		Client: helper.Client{
 			Client: r.Client,