ci: bump golangci-lint to v1.60.3 (#4474)

Signed-off-by: zhangzujian <[email protected]>
kubeovn · Sep 5, 2024 · c55e97a · c55e97a
1 parent 4e5cc7b
commit c55e97a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -23,7 +23,7 @@ concurrency:
 env:
   GO_VERSION: ''
   KIND_VERSION: v0.24.0
-  GOLANGCI_LINT_VERSION: 'v1.60.1'
+  GOLANGCI_LINT_VERSION: 'v1.60.3'
   HELM_VERSION: v3.15.4
   SUBMARINER_VERSION: '0.18.0'
 

diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -256,7 +256,8 @@ func (csh cniServerHandler) releaseVf(podName, podNamespace, podNetns, ifName, n
 				ifName, vfName, podDesc, err)
 		}
 		// move VF device to host netns
-		if err = netlink.LinkSetNsFd(link, int(hostNS.Fd())); err != nil {
+		fd := int(netns.Fd()) // #nosec G115
+		if err = netlink.LinkSetNsFd(link, fd); err != nil {
 			return fmt.Errorf("failed to move container interface %s back to host namespace %s: %w",
 				ifName, podDesc, err)
 		}
@@ -407,7 +408,8 @@ func (csh cniServerHandler) configureContainerNic(podName, podNamespace, nicName
 		return nil, err
 	}
 
-	if err = netlink.LinkSetNsFd(containerLink, int(netns.Fd())); err != nil {
+	fd := int(netns.Fd()) // #nosec G115
+	if err = netlink.LinkSetNsFd(containerLink, fd); err != nil {
 		return nil, fmt.Errorf("failed to move link to netns: %w", err)
 	}
 
@@ -791,7 +793,8 @@ func configureNodeGwNic(portName, ip, gw string, macAddr net.HardwareAddr, mtu i
 	}
 	gwLink, err := netlink.LinkByName(util.NodeGwNic)
 	if err == nil {
-		if err = netlink.LinkSetNsFd(gwLink, int(gwNS.Fd())); err != nil {
+		fd := int(gwNS.Fd()) // #nosec G115
+		if err = netlink.LinkSetNsFd(gwLink, fd); err != nil {
 			klog.Errorf("failed to move link into netns: %v", err)
 			return err
 		}

diff --git a/pkg/speaker/utils.go b/pkg/speaker/utils.go
@@ -86,7 +86,7 @@ func parseRoute(route string) (string, uint32, error) {
 		if err != nil {
 			return "", 0, err
 		}
-		prefixLen = uint32(intLen)
+		prefixLen = uint32(intLen) // #nosec G115
 	}
 	return prefix, prefixLen, nil
 }

diff --git a/pkg/tproxy/tproxy_tcp_linux.go b/pkg/tproxy/tproxy_tcp_linux.go
@@ -81,13 +81,14 @@ func listenTCP(device, network string, laddr *net.TCPAddr) (net.Listener, error)
 		}
 	}()
 
+	fd := int(fileDescriptorSource.Fd()) // #nosec G115
 	if device != "" {
-		if err = syscall.BindToDevice(int(fileDescriptorSource.Fd()), device); err != nil {
+		if err = syscall.BindToDevice(fd, device); err != nil {
 			return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: SO_BINDTODEVICE(%s): %w", device, err)}
 		}
 	}
 
-	if err = syscall.SetsockoptInt(int(fileDescriptorSource.Fd()), syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil {
+	if err = syscall.SetsockoptInt(fd, syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil {
 		return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: IP_TRANSPARENT: %w", err)}
 	}