chore(deps): update dependency golangci-lint to v2.5.0 (master) (#5743)

renovate[bot] · oilbeater · web-flow · commit bb56bb675a2a · 2025-09-22T14:38:32.000+08:00
* chore(deps): update dependency golangci-lint to v2.5.0

* fix lint issues

Signed-off-by: Mengxin Liu &lt;liumengxinfly@gmail.com&gt;

---------

Signed-off-by: Mengxin Liu &lt;liumengxinfly@gmail.com&gt;
Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: Mengxin Liu &lt;liumengxinfly@gmail.com&gt;
diff --git 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.4.0
+  GOLANGCI_LINT_VERSION: v2.5.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
diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go
@@ -222,7 +222,7 @@ func Retry(attempts, sleep int, f func(configuration *daemon.Configuration) erro
 	for i := 0; ; i++ {
 		err = f(ctrl)
 		if err == nil {
-			return
+			return err
 		}
 		if i >= (attempts - 1) {
 			break
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -704,7 +704,7 @@ func (c *Controller) retryDelDupChassis(attempts, sleep int, f func(node *v1.Nod
 	for ; ; i++ {
 		err = f(node)
 		if err == nil {
-			return
+			return err
 		}
 		klog.Errorf("failed to delete duplicated chassis for node %s: %v", node.Name, err)
 		if i >= (attempts - 1) {
diff --git a/pkg/controller/service_lb.go b/pkg/controller/service_lb.go
@@ -143,7 +143,7 @@ func (c *Controller) genLbSvcDeployment(svc *corev1.Service, nad *nadv1.NetworkA
 			},
 		},
 	}
-	return
+	return dp
 }
 
 func (c *Controller) updateLbSvcDeployment(svc *corev1.Service, dp *v1.Deployment) *v1.Deployment {
diff --git a/pkg/controller/signer.go b/pkg/controller/signer.go
@@ -191,7 +191,7 @@ func getCertApprovalCondition(status *csrv1.CertificateSigningRequestStatus) (ap
 			denied = true
 		}
 	}
-	return
+	return approved, denied
 }
 
 func newCertificateTemplate(certReq *x509.CertificateRequest) *x509.Certificate {
diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -1123,7 +1123,7 @@ func diffStaticRoute(exist []*ovnnb.LogicalRouterStaticRoute, target []*kubeovnv
 	for _, item := range existRouteMap {
 		routeNeedDel = append(routeNeedDel, item)
 	}
-	return
+	return routeNeedDel, routeNeedAdd, err
 }
 
 func getStaticRouteItemKey(item *kubeovnv1.StaticRoute) string {
@@ -1272,7 +1272,7 @@ func (c *Controller) getVpcSubnets(vpc *kubeovnv1.Vpc) (subnets []string, defaul
 		}
 	}
 	sort.Strings(subnets)
-	return
+	return subnets, defaultSubnet, err
 }
 
 // createVpcRouter create router to connect logical switches in vpc
diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go
@@ -626,7 +626,7 @@ func routeDiff(nodeNicRoutes, allRoutes []netlink.Route, cidrs, joinCIDR []strin
 	if len(toAdd) > 0 {
 		klog.Infof("routes to add: %v", toAdd)
 	}
-	return
+	return toAdd, toDel
 }
 
 func getRulesToAdd(oldRules, newRules []netlink.Rule) []netlink.Rule {
@@ -671,20 +671,20 @@ func (c *Controller) diffPolicyRouting(oldSubnet, newSubnet *kubeovnv1.Subnet) (
 	oldRules, oldRoutes, err := c.getPolicyRouting(oldSubnet)
 	if err != nil {
 		klog.Error(err)
-		return
+		return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err
 	}
 	newRules, newRoutes, err := c.getPolicyRouting(newSubnet)
 	if err != nil {
 		klog.Error(err)
-		return
+		return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err
 	}
 
 	rulesToAdd = getRulesToAdd(oldRules, newRules)
 	rulesToDel = getRulesToAdd(newRules, oldRules)
 	routesToAdd = getRoutesToAdd(oldRoutes, newRoutes)
 	routesToDel = getRoutesToAdd(newRoutes, oldRoutes)
 
-	return
+	return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err
 }
 
 func (c *Controller) getPolicyRouting(subnet *kubeovnv1.Subnet) ([]netlink.Rule, []netlink.Route, error) {
diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -377,7 +377,7 @@ func (csh cniServerHandler) rollbackOvsPort(hostNicName, containerNicName, nicTy
 		klog.Warningf("failed to delete down ovs port %v, %q", err, output)
 	}
 	klog.Infof("rollback ovs port success %s", nicName)
-	return
+	return err
 }
 
 func generateNicName(containerID, ifname string) (string, string) {
diff --git a/pkg/daemon/server.go b/pkg/daemon/server.go
@@ -91,5 +91,5 @@ func getRequestURI(request *restful.Request) (uri string) {
 	if request.Request.URL != nil {
 		uri = request.Request.URL.RequestURI()
 	}
-	return
+	return uri
 }
diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go
@@ -467,7 +467,7 @@ func (ipam *IPAM) IPPoolStatistics(subnet, ippool string) (
 
 	s := ipam.Subnets[subnet]
 	if s == nil {
-		return
+		return v4Available, v4Using, v6Available, v6Using, v4AvailableRange, v4UsingRange, v6AvailableRange, v6UsingRange
 	}
 	return s.IPPoolStatistics(ippool)
 }
diff --git a/pkg/ipam/subnet.go b/pkg/ipam/subnet.go
@@ -807,7 +807,7 @@ func (s *Subnet) IPPoolStatistics(ippool string) (
 
 	p := s.IPPools[ippool]
 	if p == nil {
-		return
+		return v4Available, v4Using, v6Available, v6Using, v4AvailableRange, v4UsingRange, v6AvailableRange, v6UsingRange
 	}
 
 	v4Available = p.V4Available.Count()
@@ -819,5 +819,5 @@ func (s *Subnet) IPPoolStatistics(ippool string) (
 	v4UsingRange = p.V4Using.String()
 	v6UsingRange = p.V6Using.String()
 
-	return
+	return v4Available, v4Using, v6Available, v6Using, v4AvailableRange, v4UsingRange, v6AvailableRange, v6UsingRange
 }
diff --git a/pkg/ovnmonitor/util.go b/pkg/ovnmonitor/util.go
@@ -159,7 +159,7 @@ func lspAddress(addresses []ovsdb.OvnLogicalSwitchPortAddress) (mac, ip string)
 		ips = append(ips, address.String())
 	}
 	ip = strings.Join(ips, " ")
-	return
+	return mac, ip
 }
 
 func (e *Exporter) setLogicalSwitchPortInfoMetric() {
diff --git a/pkg/ovs/ovn-nb-dhcp_options.go b/pkg/ovs/ovn-nb-dhcp_options.go
@@ -107,7 +107,7 @@ func (c *OVNNbClient) updateDHCPv4Options(lsName, cidr, gateway, options string,
 	dhcpOpt, err := c.GetDHCPOptions(lsName, protocol, true)
 	if err != nil {
 		klog.Error(err)
-		return
+		return uuid, err
 	}
 
 	/* update */
@@ -146,7 +146,7 @@ func (c *OVNNbClient) updateDHCPv6Options(lsName, cidr, options string) (uuid st
 	dhcpOpt, err := c.GetDHCPOptions(lsName, protocol, true)
 	if err != nil {
 		klog.Error(err)
-		return
+		return uuid, err
 	}
 
 	/* update */
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -93,21 +93,21 @@ func (v *ValidatingHook) Handle(ctx context.Context, req admission.Request) (res
 		if createHooks[req.Kind] != nil {
 			klog.Infof("handle create %s %s@%s", req.Kind, req.Name, req.Namespace)
 			resp = createHooks[req.Kind](ctx, req)
-			return
+			return resp
 		}
 	case admissionv1.Update:
 		if updateHooks[req.Kind] != nil {
 			klog.Infof("handle update %s %s@%s", req.Kind, req.Name, req.Namespace)
 			resp = updateHooks[req.Kind](ctx, req)
-			return
+			return resp
 		}
 	case admissionv1.Delete:
 		if deleteHooks[req.Kind] != nil {
 			klog.Infof("handle delete %s %s@%s", req.Kind, req.Name, req.Namespace)
 			resp = deleteHooks[req.Kind](ctx, req)
-			return
+			return resp
 		}
 	}
 	resp = ctrlwebhook.Allowed("by pass")
-	return
+	return resp
 }
diff --git a/test/e2e/framework/docker/exec.go b/test/e2e/framework/docker/exec.go
@@ -72,5 +72,5 @@ func Exec(id string, env []string, cmd ...string) (stdout, stderr []byte, err er
 		framework.Logf("stderr:\n%s", string(stderr))
 	}
 
-	return
+	return stdout, stderr, err
 }
diff --git a/test/e2e/framework/http/http.go b/test/e2e/framework/http/http.go
@@ -33,7 +33,7 @@ func runCaseOnce(runner *httprunner.CaseRunner) (failure *Report) {
 	if err != nil {
 		failure.Elapsed = time.Since(startTime).Milliseconds()
 		failure.Attachments = fmt.Errorf("failed to start session: %w", err).Error()
-		return
+		return failure
 	}
 
 	if !summary.Success {
@@ -43,7 +43,7 @@ func runCaseOnce(runner *httprunner.CaseRunner) (failure *Report) {
 			failure.Elapsed = time.Since(startTime).Milliseconds()
 			failure.Attachments = "unexpected empty summary records"
 		}
-		return
+		return failure
 	}
 
 	if len(summary.Records) != 1 {

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func Retry(attempts, sleep int, f func(configuration *daemon.Configuration) erro`
`222`	`222`	`for i := 0; ; i++ {`
`223`	`223`	`err = f(ctrl)`
`224`	`224`	`if err == nil {`
`225`		`- return`
	`225`	`+ return err`
`226`	`226`	`}`
`227`	`227`	`if i >= (attempts - 1) {`
`228`	`228`	`break`
Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,7 @@ func (c Controller) retryDelDupChassis(attempts, sleep int, f func(node v1.Nod`
`704`	`704`	`for ; ; i++ {`
`705`	`705`	`err = f(node)`
`706`	`706`	`if err == nil {`
`707`		`- return`
	`707`	`+ return err`
`708`	`708`	`}`
`709`	`709`	`klog.Errorf("failed to delete duplicated chassis for node %s: %v", node.Name, err)`
`710`	`710`	`if i >= (attempts - 1) {`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func (c Controller) genLbSvcDeployment(svc corev1.Service, nad *nadv1.NetworkA`
`143`	`143`	`},`
`144`	`144`	`},`
`145`	`145`	`}`
`146`		`- return`
	`146`	`+ return dp`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`func (c Controller) updateLbSvcDeployment(svc corev1.Service, dp v1.Deployment) v1.Deployment {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func getCertApprovalCondition(status *csrv1.CertificateSigningRequestStatus) (ap`
`191`	`191`	`denied = true`
`192`	`192`	`}`
`193`	`193`	`}`
`194`		`- return`
	`194`	`+ return approved, denied`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`func newCertificateTemplate(certReq x509.CertificateRequest) x509.Certificate {`
Original file line number	Diff line number	Diff line change
`@@ -1123,7 +1123,7 @@ func diffStaticRoute(exist []ovnnb.LogicalRouterStaticRoute, target []kubeovnv`
`1123`	`1123`	`for _, item := range existRouteMap {`
`1124`	`1124`	`routeNeedDel = append(routeNeedDel, item)`
`1125`	`1125`	`}`
`1126`		`- return`
	`1126`	`+ return routeNeedDel, routeNeedAdd, err`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`	`1129`	`func getStaticRouteItemKey(item *kubeovnv1.StaticRoute) string {`
`@@ -1272,7 +1272,7 @@ func (c Controller) getVpcSubnets(vpc kubeovnv1.Vpc) (subnets []string, defaul`
`1272`	`1272`	`}`
`1273`	`1273`	`}`
`1274`	`1274`	`sort.Strings(subnets)`
`1275`		`- return`
	`1275`	`+ return subnets, defaultSubnet, err`
`1276`	`1276`	`}`
`1277`	`1277`
`1278`	`1278`	`// createVpcRouter create router to connect logical switches in vpc`
Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ func routeDiff(nodeNicRoutes, allRoutes []netlink.Route, cidrs, joinCIDR []strin`
`626`	`626`	`if len(toAdd) > 0 {`
`627`	`627`	`klog.Infof("routes to add: %v", toAdd)`
`628`	`628`	`}`
`629`		`- return`
	`629`	`+ return toAdd, toDel`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`func getRulesToAdd(oldRules, newRules []netlink.Rule) []netlink.Rule {`
`@@ -671,20 +671,20 @@ func (c Controller) diffPolicyRouting(oldSubnet, newSubnet kubeovnv1.Subnet) (`
`671`	`671`	`oldRules, oldRoutes, err := c.getPolicyRouting(oldSubnet)`
`672`	`672`	`if err != nil {`
`673`	`673`	`klog.Error(err)`
`674`		`- return`
	`674`	`+ return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err`
`675`	`675`	`}`
`676`	`676`	`newRules, newRoutes, err := c.getPolicyRouting(newSubnet)`
`677`	`677`	`if err != nil {`
`678`	`678`	`klog.Error(err)`
`679`		`- return`
	`679`	`+ return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err`
`680`	`680`	`}`
`681`	`681`
`682`	`682`	`rulesToAdd = getRulesToAdd(oldRules, newRules)`
`683`	`683`	`rulesToDel = getRulesToAdd(newRules, oldRules)`
`684`	`684`	`routesToAdd = getRoutesToAdd(oldRoutes, newRoutes)`
`685`	`685`	`routesToDel = getRoutesToAdd(newRoutes, oldRoutes)`
`686`	`686`
`687`		`- return`
	`687`	`+ return rulesToAdd, rulesToDel, routesToAdd, routesToDel, err`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`func (c Controller) getPolicyRouting(subnet kubeovnv1.Subnet) ([]netlink.Rule, []netlink.Route, error) {`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ func (csh cniServerHandler) rollbackOvsPort(hostNicName, containerNicName, nicTy`
`377`	`377`	`klog.Warningf("failed to delete down ovs port %v, %q", err, output)`
`378`	`378`	`}`
`379`	`379`	`klog.Infof("rollback ovs port success %s", nicName)`
`380`		`- return`
	`380`	`+ return err`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`func generateNicName(containerID, ifname string) (string, string) {`
Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,5 @@ func getRequestURI(request *restful.Request) (uri string) {`
`91`	`91`	`if request.Request.URL != nil {`
`92`	`92`	`uri = request.Request.URL.RequestURI()`
`93`	`93`	`}`
`94`		`- return`
	`94`	`+ return uri`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ func (ipam *IPAM) IPPoolStatistics(subnet, ippool string) (`
`467`	`467`
`468`	`468`	`s := ipam.Subnets[subnet]`
`469`	`469`	`if s == nil {`
`470`		`- return`
	`470`	`+ return v4Available, v4Using, v6Available, v6Using, v4AvailableRange, v4UsingRange, v6AvailableRange, v6UsingRange`
`471`	`471`	`}`
`472`	`472`	`return s.IPPoolStatistics(ippool)`
`473`	`473`	`}`