Merge pull request #5240 from twz123/copyloopvar

Enable copyloopvar linter

.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:

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)

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{}

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)

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)

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 {

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()

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()