Merge branch 'main' into feature/modernize_update

Author: atombrella

.github/workflows/test.yaml

@@ -22,7 +22,7 @@ jobs:
           format: auto
       - uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.3.0
+          version: v2.10.0
           args: -v
   verify-vendor:
     name: Verify vendor directory

.golangci.yml

@@ -25,6 +25,21 @@ linters:
           pkg: ^github.com/vishvananda/netlink$
           msg: Use internal netlinksafe package for EINTR handling.
       analyze-types: true
+    revive:
+      max-open-files: 2048
+      enable-default-rules: true
+      rules:
+        - name: var-naming
+          arguments:
+            - ["ID"] # AllowList
+            - ["VM"] # DenyList
+            - - skip-initialism-name-checks: true
+                upper-case-const: true
+                skip-package-name-checks: true
+                skip-package-name-collision-with-go-std: true
+                extra-bad-package-names:
+                  - helpers
+                  - models
     staticcheck:
       checks:
         - all

go.mod

@@ -1,6 +1,6 @@
 module github.com/containernetworking/plugins
 
-go 1.24.2
+go 1.25.0
 
 require (
 	github.com/Microsoft/hcsshim v0.13.0

pkg/ip/ipmasq_iptables_linux.go

@@ -42,6 +42,7 @@ func setupIPMasqIPTables(ipns []*net.IPNet, network, _, containerID string) erro
 
 // SetupIPMasq installs iptables rules to masquerade traffic
 // coming from ip of ipn and going outside of ipn.
+//
 // Deprecated: This function only supports iptables. Use SetupIPMasqForNetworks, which
 // supports both iptables and nftables.
 func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
@@ -109,6 +110,7 @@ func teardownIPMasqIPTables(ipns []*net.IPNet, network, _, containerID string) e
 }
 
 // TeardownIPMasq undoes the effects of SetupIPMasq.
+//
 // Deprecated: This function only supports iptables. Use TeardownIPMasqForNetworks, which
 // supports both iptables and nftables.
 func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {