From e03bbe2b29938634d43c66d963ded0d531ccbc10 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 02:20:09 +0000 Subject: [PATCH 1/2] chore(deps): update dependency golangci-lint to v2.6.0 --- .github/workflows/build-x86-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 143e1a6c5ed..be93e7b71bb 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -24,7 +24,7 @@ env: # renovate: datasource=github-releases depName=kind packageName=kubernetes-sigs/kind KIND_VERSION: v0.30.0 # renovate: datasource=github-releases depName=golangci-lint packageName=golangci/golangci-lint - GOLANGCI_LINT_VERSION: v2.5.0 + GOLANGCI_LINT_VERSION: v2.6.0 # renovate: datasource=github-releases depName=helm packageName=helm/helm HELM_VERSION: v3.19.0 # renovate: datasource=github-releases depName=submariner packageName=submariner-io/submariner From 58b07f5c5688c3ff7d1327159dd002ad6b80d6bc Mon Sep 17 00:00:00 2001 From: Mengxin Liu Date: Fri, 31 Oct 2025 02:35:42 +0000 Subject: [PATCH 2/2] fix lint issues Signed-off-by: Mengxin Liu --- cmd/cni/sysctl.go | 1 - cmd/daemon/init.go | 1 - pkg/apis/kubeovn/v1/zz_generated.deepcopy.go | 1 - pkg/daemon/ipsec.go | 1 - pkg/daemon/listen.go | 1 - pkg/netconf/netconf.go | 1 - pkg/request/client.go | 1 - pkg/util/address_family.go | 1 - pkg/util/arp.go | 1 - pkg/util/iptables.go | 1 - pkg/util/link.go | 1 - pkg/util/ndp.go | 1 - pkg/util/strings_test.go | 1 - test/e2e/vpc-egress-gateway/e2e_test.go | 6 ++++-- 14 files changed, 4 insertions(+), 15 deletions(-) diff --git a/cmd/cni/sysctl.go b/cmd/cni/sysctl.go index 49f106376f0..b44841be70c 100644 --- a/cmd/cni/sysctl.go +++ b/cmd/cni/sysctl.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package main diff --git a/cmd/daemon/init.go b/cmd/daemon/init.go index ebe2bf293db..2211e5b331c 100644 --- a/cmd/daemon/init.go +++ b/cmd/daemon/init.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package main diff --git a/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go b/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go index d599eecd2bc..7f9b69cc3e9 100644 --- a/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go +++ b/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright The Kubernetes Authors. diff --git a/pkg/daemon/ipsec.go b/pkg/daemon/ipsec.go index 2b97e947853..d85223c9ebf 100644 --- a/pkg/daemon/ipsec.go +++ b/pkg/daemon/ipsec.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package daemon diff --git a/pkg/daemon/listen.go b/pkg/daemon/listen.go index b943a83aa20..6ca443eebc6 100644 --- a/pkg/daemon/listen.go +++ b/pkg/daemon/listen.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package daemon diff --git a/pkg/netconf/netconf.go b/pkg/netconf/netconf.go index 17d4e588232..cd4841024a3 100644 --- a/pkg/netconf/netconf.go +++ b/pkg/netconf/netconf.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package netconf diff --git a/pkg/request/client.go b/pkg/request/client.go index cdb8649cf24..193e913cdda 100644 --- a/pkg/request/client.go +++ b/pkg/request/client.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package request diff --git a/pkg/util/address_family.go b/pkg/util/address_family.go index 1b4e09525b5..4402d35dba4 100644 --- a/pkg/util/address_family.go +++ b/pkg/util/address_family.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/arp.go b/pkg/util/arp.go index d3d911a5501..2b6f8dfc934 100644 --- a/pkg/util/arp.go +++ b/pkg/util/arp.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/iptables.go b/pkg/util/iptables.go index 58d68d70f24..f3ca2df7bcc 100644 --- a/pkg/util/iptables.go +++ b/pkg/util/iptables.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/link.go b/pkg/util/link.go index ca1e1555b30..52984022b89 100644 --- a/pkg/util/link.go +++ b/pkg/util/link.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/ndp.go b/pkg/util/ndp.go index bbd0082044a..1ca0e950438 100644 --- a/pkg/util/ndp.go +++ b/pkg/util/ndp.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/strings_test.go b/pkg/util/strings_test.go index 7b5359e7cec..4dfb9f9fb47 100644 --- a/pkg/util/strings_test.go +++ b/pkg/util/strings_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/test/e2e/vpc-egress-gateway/e2e_test.go b/test/e2e/vpc-egress-gateway/e2e_test.go index a116018ada1..4a32bbae11b 100644 --- a/test/e2e/vpc-egress-gateway/e2e_test.go +++ b/test/e2e/vpc-egress-gateway/e2e_test.go @@ -420,9 +420,11 @@ func addEcmpRoutes(namespaceName, podName string, destinations, nextHops []strin if len(nextHops) == 1 { args = " via " + nextHops[0] } else { - for _, ip := range nextHops { - args += fmt.Sprintf(" nexthop via %s dev net1 weight 1", ip) + nexthops := make([]string, len(nextHops)) + for i, ip := range nextHops { + nexthops[i] = fmt.Sprintf(" nexthop via %s dev net1 weight 1", ip) } + args = strings.Join(nexthops, "") } for _, dst := range destinations { cmd := fmt.Sprintf("ip route add %s%s", dst, args)