diff --git a/.golangci.yml b/.golangci.yml index 28c5f2ad5f42..fc415a734044 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -10,12 +10,13 @@ run: linters: enable: - - depguard # Checks if package imports are in a list of acceptable packages - - dupword # Finds word repetitions - - errorlint # Find code that will cause problems with Go's error wrapping scheme - - gofmt # Checks whether code was gofmt-ed - - goheader # Checks is file headers matche a given pattern - - revive # Stricter drop-in replacement for golint + - copyloopvar # Detects unnecessary copies of loop variables for Go >= 1.22 + - depguard # Checks if package imports are in a list of acceptable packages + - dupword # Finds word repetitions + - errorlint # Find code that will cause problems with Go's error wrapping scheme + - gofmt # Checks whether code was gofmt-ed + - goheader # Checks is file headers matche a given pattern + - revive # Stricter drop-in replacement for golint linters-settings: depguard: diff --git a/inttest/bind-address/bind_address_test.go b/inttest/bind-address/bind_address_test.go index dcb13b7a1ee6..31002a4f82d2 100644 --- a/inttest/bind-address/bind_address_test.go +++ b/inttest/bind-address/bind_address_test.go @@ -133,7 +133,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C }) for _, lease := range []string{"kube-scheduler", "kube-controller-manager"} { - lease := lease eg.Go(func() error { id, err := common.WaitForLease(ctx, clients, lease, kubeSystem) if err != nil { @@ -145,7 +144,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C } for _, daemonSet := range []string{"kube-proxy", "konnectivity-agent"} { - daemonSet := daemonSet eg.Go(func() error { if err := common.WaitForDaemonSet(ctx, clients, daemonSet, "kube-system"); err != nil { return fmt.Errorf("%s is not ready: %w", daemonSet, err) @@ -156,7 +154,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C } for _, deployment := range []string{"coredns", "metrics-server"} { - deployment := deployment eg.Go(func() error { if err := common.WaitForDeployment(ctx, clients, deployment, "kube-system"); err != nil { return fmt.Errorf("%s did not become ready: %w", deployment, err) diff --git a/inttest/etcdmember/etcdmember_test.go b/inttest/etcdmember/etcdmember_test.go index 317e4d30bb11..43187802bf28 100644 --- a/inttest/etcdmember/etcdmember_test.go +++ b/inttest/etcdmember/etcdmember_test.go @@ -87,8 +87,6 @@ func (s *EtcdMemberSuite) TestDeregistration() { eg := errgroup.Group{} for i, obj := range expectedObjects { - i, obj := i, obj - eg.Go(func() error { s.T().Logf("verifying initial status of %s", obj) em := &etcdv1beta1.EtcdMember{} diff --git a/inttest/nllb/nllb_test.go b/inttest/nllb/nllb_test.go index 4917d9a196b5..7d67ae79edb2 100644 --- a/inttest/nllb/nllb_test.go +++ b/inttest/nllb/nllb_test.go @@ -288,7 +288,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C }) for _, lease := range []string{"kube-scheduler", "kube-controller-manager"} { - lease := lease eg.Go(func() error { id, err := common.WaitForLease(ctx, clients, lease, kubeSystem) if err != nil { @@ -300,7 +299,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C } for _, daemonSet := range []string{"kube-proxy", "konnectivity-agent"} { - daemonSet := daemonSet eg.Go(func() error { if err := common.WaitForDaemonSet(ctx, clients, daemonSet, "kube-system"); err != nil { return fmt.Errorf("%s is not ready: %w", daemonSet, err) @@ -311,7 +309,6 @@ func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.C } for _, deployment := range []string{"coredns", "metrics-server"} { - deployment := deployment eg.Go(func() error { if err := common.WaitForDeployment(ctx, clients, deployment, "kube-system"); err != nil { return fmt.Errorf("%s did not become ready: %w", deployment, err) diff --git a/pkg/autopilot/controller/readyprober.go b/pkg/autopilot/controller/readyprober.go index c111a018f1b1..33115d85c5ea 100644 --- a/pkg/autopilot/controller/readyprober.go +++ b/pkg/autopilot/controller/readyprober.go @@ -78,7 +78,6 @@ func (p readyProber) Probe() error { g := errgroup.Group{} for _, target := range p.targets { - target := target g.Go(func() error { return func(target apv1beta2.PlanCommandTargetStatus) error { return p.probeOne(target) diff --git a/pkg/component/worker/config/loader.go b/pkg/component/worker/config/loader.go index 4319ecd6366f..8071cbbbc772 100644 --- a/pkg/component/worker/config/loader.go +++ b/pkg/component/worker/config/loader.go @@ -256,7 +256,6 @@ func loadConcurrently(ctx context.Context, addresses []string, loadWorkerConfig numActiveLoaders.Store(int64(numAddresses)) for pos, address := range addresses { - pos, address := pos, address go func() { defer func() { if numActiveLoaders.Add(-1) == 0 { diff --git a/pkg/kubernetes/watch/watcher_test.go b/pkg/kubernetes/watch/watcher_test.go index 31cd7056b5a9..7947af997902 100644 --- a/pkg/kubernetes/watch/watcher_test.go +++ b/pkg/kubernetes/watch/watcher_test.go @@ -190,7 +190,6 @@ func TestWatcher(t *testing.T) { {apiwatch.Error, "watch error"}, {apiwatch.EventType("Bogus"), "unexpected watch event (Bogus)"}, } { - test := test t.Run(string(test.eventType), func(t *testing.T) { t.Parallel() provider, underTest := newTestWatcher() diff --git a/pkg/token/joinclient_test.go b/pkg/token/joinclient_test.go index a977a3a5eac7..0b2ef274eb9d 100644 --- a/pkg/token/joinclient_test.go +++ b/pkg/token/joinclient_test.go @@ -115,7 +115,6 @@ func TestJoinClient_Cancellation(t *testing.T) { return err }}, } { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel()