lint

Author: Igor Velichkovich

fault-remediation/main.go

@@ -167,11 +167,13 @@ func setupNonCtrlRuntimeManaged(ctx context.Context, params initializer.Initiali
 
 		for event := range components.FaultRemediationReconciler.Watcher.Events() {
 			slog.Info("Event received", "event", event)
+
 			for i := 1; i <= components.FaultRemediationReconciler.Config.UpdateMaxRetries; i++ {
 				_, err = components.FaultRemediationReconciler.Reconcile(gCtx, &event)
 				if err == nil {
 					break
 				}
+
 				slog.Error("Error processing event", "event", event, "error", err)
 
 				if i < components.FaultRemediationReconciler.Config.UpdateMaxRetries {

fault-remediation/pkg/annotation/annotation.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log/slog"
+	"time"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"log/slog"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"time"
 )
 
 // CtrlRuntimeAnnotationManager manages node annotations for tracking remediation state.
@@ -29,6 +30,7 @@ func (m *CtrlRuntimeAnnotationManager) GetRemediationState(
 	nodeName string,
 ) (*RemediationStateAnnotation, *corev1.Node, error) {
 	node := &corev1.Node{}
+
 	err := m.client.Get(ctx, types.NamespacedName{
 		Name: nodeName,
 	}, node)
@@ -105,15 +107,18 @@ func (m *CtrlRuntimeAnnotationManager) UpdateRemediationState(ctx context.Contex
 // ClearRemediationState removes the remediation state annotation from a node
 func (m *CtrlRuntimeAnnotationManager) ClearRemediationState(ctx context.Context, nodeName string) error {
 	node := &corev1.Node{}
+
 	err := m.client.Get(ctx, types.NamespacedName{
 		Name: nodeName,
 	}, node)
 	if err != nil {
 		return fmt.Errorf("failed to get node %s: %w", nodeName, err)
 	}
+
 	if node.Annotations == nil {
 		return nil
 	}
+
 	patchBase := node.DeepCopy()
 	delete(node.Annotations, AnnotationKey)
 

fault-remediation/pkg/annotation/annotation_interface.go

@@ -2,8 +2,9 @@ package annotation
 
 import (
 	"context"
-	corev1 "k8s.io/api/core/v1"
 	"time"
+
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (

fault-remediation/pkg/annotation/deprecated_annotation.go

@@ -92,6 +92,7 @@ func (m *NodeAnnotationManager) GetRemediationState(
 			if isRetryableError(err) {
 				slog.Warn("Retryable error getting node", "node", nodeName, "error", err)
 			}
+
 			return err
 		}
 

fault-remediation/pkg/crstatus/checker.go

@@ -18,10 +18,11 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
 )
 
 type CtrlRuntimeCRStatusChecker struct {

fault-remediation/pkg/initializer/init.go

@@ -17,11 +17,12 @@ package initializer
 import (
 	"context"
 	"fmt"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
-	"k8s.io/client-go/kubernetes"
 	"log/slog"
 	"time"
 
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
+	"k8s.io/client-go/kubernetes"
+
 	"github.com/nvidia/nvsentinel/commons/pkg/configmanager"
 	"github.com/nvidia/nvsentinel/commons/pkg/statemanager"
 	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
@@ -47,7 +48,11 @@ type Components struct {
 }
 
 // nolint: cyclop // todo
-func InitializeAll(ctx context.Context, params InitializationParams, ctrlruntimeClient ctrlruntimeClient.Client) (*Components, error) {
+func InitializeAll(
+	ctx context.Context,
+	params InitializationParams,
+	ctrlruntimeClient ctrlruntimeClient.Client,
+) (*Components, error) {
 	slog.Info("Starting fault remediation module initialization")
 
 	if ctrlruntimeClient == nil && params.UseCtrlRuntime {
@@ -75,8 +80,11 @@ func InitializeAll(ctx context.Context, params InitializationParams, ctrlruntime
 		slog.Info("Log collector enabled")
 	}
 
-	var remediationClient remediation.FaultRemediationClientInterface
-	var clientSet kubernetes.Interface
+	var (
+		remediationClient remediation.FaultRemediationClientInterface
+		clientSet         kubernetes.Interface
+	)
+
 	if params.UseCtrlRuntime {
 		remediationClient, err = remediation.NewCtrlRuntimeRemediationClient(
 			ctrlruntimeClient,

fault-remediation/pkg/reconciler/reconciler.go

@@ -18,15 +18,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/annotation"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/events"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/metrics"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"log/slog"
 	"strings"
 	"time"
 
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/annotation"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/events"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/metrics"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
 	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
@@ -54,7 +53,6 @@ type ReconcilerConfig struct {
 	EnableLogCollector bool
 	UpdateMaxRetries   int
 	UpdateRetryDelay   time.Duration
-	test               metav1.Time
 }
 
 // FaultRemediationReconciler reconciles health events from a datastore change stream
@@ -170,7 +168,11 @@ func (r *FaultRemediationReconciler) shouldSkipEvent(ctx context.Context,
 }
 
 // runLogCollector runs log collector for non-NONE actions if enabled
-func (r *FaultRemediationReconciler) runLogCollector(ctx context.Context, healthEvent *protos.HealthEvent, eventUID string) (ctrl.Result, error) {
+func (r *FaultRemediationReconciler) runLogCollector(
+	ctx context.Context,
+	healthEvent *protos.HealthEvent,
+	eventUID string,
+) (ctrl.Result, error) {
 	if healthEvent.RecommendedAction == protos.RecommendedAction_NONE || !r.Config.EnableLogCollector {
 		return ctrl.Result{}, nil
 	}
@@ -204,6 +206,7 @@ func (r *FaultRemediationReconciler) performRemediation(
 	if err != nil {
 		slog.Error("Error updating node label to remediating", "error", err)
 		metrics.ProcessingErrors.WithLabelValues("label_update_error", nodeName).Inc()
+
 		return "", err
 	}
 
@@ -213,9 +216,11 @@ func (r *FaultRemediationReconciler) performRemediation(
 	}
 
 	remediationLabelValue := statemanager.RemediationSucceededLabelValue
+
 	crName, createMaintenanceResourceError := r.Config.RemediationClient.CreateMaintenanceResource(ctx, healthEventData)
 	if createMaintenanceResourceError != nil {
 		metrics.ProcessingErrors.WithLabelValues("cr_creation_failed", nodeName).Inc()
+
 		remediationLabelValue = statemanager.RemediationFailedLabelValue
 		// don't throw error yet so we can update state
 	}
@@ -228,8 +233,10 @@ func (r *FaultRemediationReconciler) performRemediation(
 			"label", remediationLabelValue,
 			"error", err)
 		metrics.ProcessingErrors.WithLabelValues("label_update_error", nodeName).Inc()
+
 		return "", errors.Join(createMaintenanceResourceError, err)
 	}
+
 	if createMaintenanceResourceError != nil {
 		return "", createMaintenanceResourceError
 	}
@@ -268,6 +275,7 @@ func (r *FaultRemediationReconciler) handleCancellationEvent(
 }
 
 // handleRemediationEvent processes remediation for quarantined nodes
+// nolint: cyclop // todo
 func (r *FaultRemediationReconciler) handleRemediationEvent(
 	ctx context.Context,
 	healthEventWithStatus *events.HealthEventDoc,
@@ -283,6 +291,7 @@ func (r *FaultRemediationReconciler) handleRemediationEvent(
 		if err := watcherInstance.MarkProcessed(ctx, eventWithToken.ResumeToken); err != nil {
 			metrics.ProcessingErrors.WithLabelValues("mark_processed_error", nodeName).Inc()
 			slog.Error("Error updating resume token", "error", err)
+
 			return ctrl.Result{}, err
 		}
 
@@ -307,6 +316,7 @@ func (r *FaultRemediationReconciler) handleRemediationEvent(
 		if err = watcherInstance.MarkProcessed(ctx, eventWithToken.ResumeToken); err != nil {
 			metrics.ProcessingErrors.WithLabelValues("mark_processed_error", nodeName).Inc()
 			slog.Error("Error updating resume token", "error", err)
+
 			return ctrl.Result{}, err
 		}
 
@@ -320,13 +330,15 @@ func (r *FaultRemediationReconciler) handleRemediationEvent(
 	}
 
 	_, performRemediationErr := r.performRemediation(ctx, healthEventWithStatus)
+
 	nodeRemediatedStatus := performRemediationErr == nil // success if no error thrown
 	if err = r.updateNodeRemediatedStatus(ctx, healthEventStore, eventWithToken, nodeRemediatedStatus); err != nil {
 		metrics.ProcessingErrors.WithLabelValues("update_status_error", nodeName).Inc()
 		slog.Error("Error updating remediation status for node", "error", err)
 
 		return ctrl.Result{}, errors.Join(performRemediationErr, err)
 	}
+
 	if performRemediationErr != nil {
 		return ctrl.Result{}, performRemediationErr
 	}
@@ -336,6 +348,7 @@ func (r *FaultRemediationReconciler) handleRemediationEvent(
 	if err = watcherInstance.MarkProcessed(ctx, eventWithToken.ResumeToken); err != nil {
 		metrics.ProcessingErrors.WithLabelValues("mark_processed_error", nodeName).Inc()
 		slog.Error("Error updating resume token", "error", err)
+
 		return ctrl.Result{}, err
 	}
 

fault-remediation/pkg/reconciler/reconciler_e2e_test.go

@@ -16,29 +16,15 @@ package reconciler
 
 import (
 	"context"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/annotation"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/events"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/metrics"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
-	"k8s.io/client-go/kubernetes/scheme"
+
 	"log"
 	"os"
 	"path/filepath"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sync"
 	"testing"
 	"time"
 
-	"github.com/nvidia/nvsentinel/data-models/pkg/model"
-	"github.com/nvidia/nvsentinel/data-models/pkg/protos"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/common"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
-	"github.com/nvidia/nvsentinel/store-client/pkg/datastore"
-	"github.com/nvidia/nvsentinel/store-client/pkg/testutils"
-
-	"github.com/nvidia/nvsentinel/commons/pkg/statemanager"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
@@ -50,17 +36,19 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/restmapper"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/nvidia/nvsentinel/commons/pkg/statemanager"
 	"github.com/nvidia/nvsentinel/data-models/pkg/model"
 	"github.com/nvidia/nvsentinel/data-models/pkg/protos"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/annotation"
 	"github.com/nvidia/nvsentinel/fault-remediation/pkg/common"
 	"github.com/nvidia/nvsentinel/fault-remediation/pkg/config"
-	"github.com/nvidia/nvsentinel/fault-remediation/pkg/crstatus"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/events"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/metrics"
+	"github.com/nvidia/nvsentinel/fault-remediation/pkg/remediation"
 	"github.com/nvidia/nvsentinel/store-client/pkg/datastore"
 	"github.com/nvidia/nvsentinel/store-client/pkg/testutils"
 )