fix: go modernize doesn't work (#6262)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Author: oilbeater

go.mod

@@ -326,7 +326,6 @@ replace (
 )
 
 tool (
-	github.com/kubeovn/kube-ovn/tools/modernize
 	github.com/onsi/ginkgo/v2/ginkgo
 	github.com/ovn-kubernetes/libovsdb/cmd/modelgen
 	go.uber.org/mock/mockgen

makefiles/build.mk

@@ -15,7 +15,7 @@ ifeq ($(strip $(GO_MOD_VERSION)),)
 $(error failed to determine Go version from go.mod)
 endif
 GOTOOLCHAIN_VERSION := go$(GO_MOD_VERSION)
-MODERNIZE_ENV := GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION)
+MODERNIZE_EXCLUDE := github.com/kubeovn/kube-ovn/mocks|github.com/kubeovn/kube-ovn/pkg/apis/kubeovn|github.com/kubeovn/kube-ovn/pkg/client
 
 .PHONY: build-go
 build-go:
@@ -148,11 +148,11 @@ lint:
     ifeq ($(CI),true)
 		@echo "Running in GitHub Actions"
 		golangci-lint run -v
-		$(MODERNIZE_ENV) go tool github.com/kubeovn/kube-ovn/tools/modernize -test -skipgenerated ./...
+		go list ./... | grep -vE '$(MODERNIZE_EXCLUDE)' | xargs go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -test
     else
 		@echo "Running in local environment"
 		golangci-lint run -v --fix
-		$(MODERNIZE_ENV) go tool github.com/kubeovn/kube-ovn/tools/modernize -test -skipgenerated -fix ./...
+		go list ./... | grep -vE '$(MODERNIZE_EXCLUDE)' | xargs go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -test -fix
     endif
 
 .PHONY: scan

pkg/controller/vpc_nat_gateway.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"reflect"
 	"regexp"
@@ -1200,9 +1201,7 @@ func (c *Controller) updateCrdNatGwLabels(key, qos string) error {
 
 	// Create a new labels map to avoid modifying the informer cache
 	labels := make(map[string]string, len(oriGw.Labels)+3)
-	for k, v := range oriGw.Labels {
-		labels[k] = v
-	}
+	maps.Copy(labels, oriGw.Labels)
 
 	// vpc nat gw label may lost
 	if len(oriGw.Labels) == 0 {

pkg/speaker/config.go

@@ -400,7 +400,7 @@ func (config *Configuration) initBgpServer() error {
 // It retries up to addPeerMaxRetries times with addPeerRetryInterval between attempts.
 func addPeerWithRetry(s *gobgp.BgpServer, peer *api.Peer) error {
 	var err error
-	for i := 0; i < addPeerMaxRetries; i++ {
+	for i := range addPeerMaxRetries {
 		if err = s.AddPeer(context.Background(), &api.AddPeerRequest{
 			Peer: peer,
 		}); err == nil {

pkg/util/vpc_nat_gateway.go

@@ -3,6 +3,7 @@ package util
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"strings"
 
 	nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
@@ -75,9 +76,7 @@ func GenNatGwPodAnnotations(userAnnotations map[string]string, gw *kubeovnv1.Vpc
 
 	// Create a new map to avoid modifying the input map (which may be from informer cache)
 	result := make(map[string]string, len(userAnnotations)+5)
-	for k, v := range userAnnotations {
-		result[k] = v
-	}
+	maps.Copy(result, userAnnotations)
 
 	// Set system annotations (overwrites any conflicting user annotations)
 	result[nadv1.NetworkAttachmentAnnot] = attachedNetworks

test/e2e/iptables-eip-qos/e2e_test.go

@@ -1005,8 +1005,8 @@ func createNatGwAndSetQosCases(f *framework.Framework,
 // Returns slice of bandwidth values in bits per second
 func parseBandwidthFromIperfOutput(text string) []float64 {
 	var bandwidths []float64
-	lines := strings.Split(text, "\n")
-	for _, line := range lines {
+	lines := strings.SplitSeq(text, "\n")
+	for line := range lines {
 		if line == "" {
 			continue
 		}