Merge pull request #4490 from AkihiroSuda/go1.25

update gomodjail (0.1.3), Go (1.25), ...

Author: AkihiroSuda

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
     - name: "Install go"
       uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5  # v5.5.0
       with:
-        go-version: "1.24"
+        go-version: "1.25"
         check-latest: true
     - name: "Compile binaries"
       env:

.github/workflows/workflow-lint.yml

@@ -35,7 +35,7 @@ jobs:
             canary: true
     with:
       timeout: 5
-      go-version: "1.24"
+      go-version: "1.25"
       runner: ubuntu-24.04
       # Note: in GitHub yaml world, if `matrix.canary` is undefined, and is passed to `inputs.canary`, the job
       # will not run. However, if you test it, it will coerce to `false`, hence:
@@ -48,7 +48,7 @@ jobs:
     uses: ./.github/workflows/job-lint-project.yml
     with:
       timeout: 5
-      go-version: "1.24"
+      go-version: "1.25"
       runner: ubuntu-24.04
 
   # Lint for shell and yaml files
@@ -68,10 +68,10 @@ jobs:
       matrix:
         include:
           # Build for both old and stable go
-          - go-version: "1.23"
           - go-version: "1.24"
+          - go-version: "1.25"
           # Additionally build for canary
-          - go-version: "1.24"
+          - go-version: "1.25"
             canary: true
     with:
       timeout: 10

.github/workflows/workflow-test.yml

@@ -30,7 +30,7 @@ jobs:
       canary: ${{ matrix.canary && true || false }}
       # Windows routinely go over 5 minutes
       timeout: 10
-      go-version: 1.24
+      go-version: 1.25
       windows-cni-version: v0.3.1
       linux-cni-version: v1.7.1
       linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
@@ -138,7 +138,7 @@ jobs:
       runner: ${{ matrix.runner }}
       binary: ${{ matrix.binary != '' && matrix.binary || 'nerdctl' }}
       canary: ${{ matrix.canary && true || false }}
-      go-version: 1.24
+      go-version: 1.25
       windows-cni-version: v0.3.1
       docker-version: 5:28.0.4-1~ubuntu.24.04~noble
       containerd-version: 2.1.3

.github/workflows/workflow-tigron.yml

@@ -9,7 +9,7 @@ on:
     paths: 'mod/tigron/**'
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
   GOTOOLCHAIN: local
 
 jobs:

.golangci.yml

@@ -99,6 +99,9 @@ linters:
         - name: use-errors-new
           # 84 occurrences. Improves error testing.
           disabled: true
+        - name: struct-tag
+          # 2 occurrences.
+          disabled: true
 
         ##### P1: consider making a dent on these, but not critical.
         - name: argument-limit
@@ -131,6 +134,9 @@ linters:
         - name: cognitive-complexity
           arguments: [205]
           # 441 occurrences (at default 7). We should try to lower it (involves significant refactoring).
+        - name: var-naming
+          # 1 occurrence.
+          disabled: true
 
         ##### P2: nice to have.
         - name: max-public-structs
@@ -155,6 +161,9 @@ linters:
         - name: exported
           # 577 occurrences. Forces documentation of any exported symbol.
           disabled: true
+        - name: unnecessary-format
+          # Many occurrences.
+          disabled: true
 
         ###### Permanently disabled. Below have been reviewed and vetted to be unnecessary.
         - name: line-length-limit
@@ -175,6 +184,9 @@ linters:
         - name: add-constant
           # 2605 occurrences. Kind of useful in itself, but unacceptable amount of effort to fix
           disabled: true
+        - name: enforce-switch-style
+          # Many occurrences.
+          disabled: true
 
     depguard:
       rules:
@@ -241,7 +253,6 @@ linters:
         - typeAssertChain
         - unlabelStmt
         - builtinShadow
-        - importShadow
         - initClause
         - nestingReduce
         - unnecessaryBlock

Dockerfile

@@ -40,17 +40,17 @@ ARG TINI_VERSION=v0.19.0@BINARY
 # Extra deps: Debug
 ARG BUILDG_VERSION=v0.5.3@BINARY
 # Extra deps: gomodjail
-ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c
+ARG GOMODJAIL_VERSION=v0.1.3@cea529ddd971b677c67d8af7e936fbc62b35b98c
 
 # Test deps
 # Currently, the Docker Official Images and the test deps are not pinned by the hash
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG UBUNTU_VERSION=24.04
 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
 ARG GOTESTSUM_VERSION=v1.12.3
 ARG NYDUS_VERSION=v2.3.2
 ARG SOCI_SNAPSHOTTER_VERSION=0.11.1
-ARG KUBO_VERSION=v0.35.0
+ARG KUBO_VERSION=v0.37.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx
 

Makefile

@@ -217,15 +217,15 @@ fix-mod:
 ##########################
 install-dev-tools:
 	$(call title, $@)
-	# golangci: v2.0.2 (2024-03-26)
+	# golangci: v2.4.0 (2025-08-14)
 	# git-validation: main (2025-02-25)
 	# ltag: main (2025-03-04)
 	# go-licenses: v2.0.0-alpha.1 (2024-06-27)
 	# stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1
 	# Issue: https://github.com/google/go-licenses/issues/312
 	@cd $(MAKEFILE_DIR) \
 	        && go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a \
-		&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \
+		&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@43d03392d7dc3746fa776dbddd66dfcccff70651 \
 		&& go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \
 		&& go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \
 		&& go install gotest.tools/gotestsum@0d9599e513d70e5792bb9334869f82f6e8b53d4d

hack/provisioning/kube/kind.sh

@@ -20,7 +20,7 @@ readonly root
 # shellcheck source=/dev/null
 . "$root/../../scripts/lib.sh"
 
-GO_VERSION=1.24
+GO_VERSION=1.25
 KIND_VERSION=v0.27.0
 CNI_PLUGINS_VERSION=v1.7.1
 # shellcheck disable=SC2034

mod/tigron/.golangci.yml

@@ -54,6 +54,10 @@ linters:
     - sloglint          # no slog
     - testifylint       # no testify
     - zerologlint       # no zerolog
+    - funcorder
+    - noctx
+    - noinlineerr
+    - wsl_v5
   settings:
     interfacebloat:
       # Default is 10
@@ -91,6 +95,12 @@ linters:
             - "fmt.Fprint"
             - "fmt.Fprintln"
             - "fmt.Fprintf"
+        - name: redundant-test-main-exit
+          disabled: true
+        - name: enforce-switch-style
+          disabled: true
+        - name: var-naming
+          disabled: true
     depguard:
       rules:
         main:

mod/tigron/Makefile

@@ -164,14 +164,14 @@ up:
 ##########################
 install-dev-tools:
 	$(call title, $@)
-	# golangci: v2.0.2 (2024-03-26)
+	# golangci: v2.4.0 (2025-08-14)
 	# git-validation: main (2025-02-25)
 	# ltag: main (2025-03-04)
 	# go-licenses: v2.0.0-alpha.1 (2024-06-27)
 	# stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1
 	# Issue: https://github.com/google/go-licenses/issues/312
 	@cd $(MAKEFILE_DIR) \
-		&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \
+		&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@43d03392d7dc3746fa776dbddd66dfcccff70651 \
 		&& go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \
 		&& go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \
 		&& go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a