fix linter

pluralsh · Jul 17, 2024 · cba8c85 · cba8c85
1 parent c37c3e7
commit cba8c85
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/internal/controller/scope.go b/internal/controller/scope.go
@@ -32,7 +32,7 @@ func NewDefaultScope[T client.Object](ctx context.Context, client client.Client,
 
 	helper, err := patch.NewHelper(object, client)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create new helper, go error: %s", err)
+		return nil, fmt.Errorf("failed to create new helper, go error: %w", err)
 	}
 
 	return &DefaultScope[T]{

diff --git a/internal/kstatus/watcher/object_status_reporter.go b/internal/kstatus/watcher/object_status_reporter.go
@@ -239,6 +239,7 @@ func (in *ObjectStatusReporter) Start(ctx context.Context) <-chan event.Event {
 		}
 	}()
 
+	//nolint
 	go wait.PollUntilContextCancel(ctx, 5*time.Second, false, func(_ context.Context) (done bool, err error) {
 		stopped := true
 		for _, ref := range in.watcherRefs {
@@ -334,6 +335,7 @@ func (in *ObjectStatusReporter) startInformerWithRetry(ctx context.Context, gkn
 				// CRD (or api extension) not installed, retry
 				klog.V(3).Infof("Watch start error (blocking until CRD is added): %v: %v", gkn, err)
 				in.restartInformer(gkn)
+				retryCount++
 				return
 			}
 

diff --git a/internal/kstatus/watcher/watcher.go b/internal/kstatus/watcher/watcher.go
@@ -27,7 +27,6 @@ type DynamicStatusWatcher struct {
 
 	// informerRefs tracks which informers have been started and stopped by the ObjectStatusReporter
 	informerRefs map[GroupKindNamespace]*watcherReference
-	name         string
 }
 
 func (in *DynamicStatusWatcher) Watch(ctx context.Context, ids object.ObjMetadataSet, opts kwatcher.Options) <-chan event.Event {

diff --git a/internal/kubernetes/watcher/retry_watcher.go b/internal/kubernetes/watcher/retry_watcher.go
@@ -126,7 +126,7 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
 			return false, 0
 		}
 
-		if apierrors.IsNotFound(err) || errors.Is(err, context.Canceled){
+		if apierrors.IsNotFound(err) || errors.Is(err, context.Canceled) {
 			klog.V(5).InfoS(msg, "err", err)
 			// Stop
 			return true, 0

diff --git a/pkg/cache/resource_cache.go b/pkg/cache/resource_cache.go
@@ -102,7 +102,7 @@ func Init(ctx context.Context, config *rest.Config, ttl time.Duration) {
 		UseCustomObjectFilter: true,
 		ObjectFilter:          nil,
 		//UseInformerRefCache:   true,
-		RESTScopeStrategy:     lo.ToPtr(kwatcher.RESTScopeRoot),
+		RESTScopeStrategy: lo.ToPtr(kwatcher.RESTScopeRoot),
 		Filters: &kwatcher.Filters{
 			Labels: common.ManagedByAgentLabelSelector(),
 			Fields: nil,
@@ -177,7 +177,7 @@ func (in *ResourceCache) Unregister(inventoryResourceKeys containers.Set[Resourc
 
 	toRemove := in.resourceKeySet.Difference(inventoryResourceKeys)
 
-	for key, _ := range toRemove {
+	for key := range toRemove {
 		in.resourceKeySet.Remove(key)
 		// TODO: we should trigger a watch stop too
 	}