Go 1.21.0

AkihiroSuda · AkihiroSuda · commit eacd74c2b0c3 · 2023-08-17T16:54:01.000+09:00
https://go.dev/doc/go1.21 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -12,7 +12,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
 		"ghcr.io/devcontainers/features/go:1": {
-			"version": "1.20"
+			"version": "1.21"
 		}
 	},
 
diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.20.7"
+          go-version: "1.21.0"
 
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 env:
   # Go version we currently use to build containerd across all CI.
   # Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
-  GO_VERSION: "1.20.7"
+  GO_VERSION: "1.21.0"
 
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
@@ -209,7 +209,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04, macos-12, windows-2019, windows-2022]
-        go-version: ["1.20.7", "1.19.12"]
+        go-version: ["1.20.7", "1.21.0"]
     steps:
       - uses: actions/setup-go@v4
         with:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -34,7 +34,7 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.7
+          go-version: 1.21.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -58,8 +58,6 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          # FIXME: go-fuzz fails with Go 1.20: `cgo_unix_cgo_res.cgo2.c:(.text+0x32): undefined reference to `__res_search'`
-          # https://github.com/containerd/containerd/pull/8103#issuecomment-1429256152
-          go-version: 1.18
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - run: script/go-test-fuzz.sh
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.20.7"
+          go-version: "1.21.0"
 
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,7 +7,7 @@ on:
       - ".github/workflows/nightly.yml"
 
 env:
-  GO_VERSION: "1.20.7"
+  GO_VERSION: "1.21.0"
 
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 name: Release
 
 env:
-  GO_VERSION: "1.20.7"
+  GO_VERSION: "1.21.0"
 
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
diff --git a/BUILDING.md b/BUILDING.md
@@ -25,7 +25,7 @@ A codespace will open in a web-based version of Visual Studio Code. The [dev con
 
 To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required:
 
-* Go 1.19.x or above
+* Go 1.20.x or above
 * Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases))
 * Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency.
 
diff --git a/Vagrantfile b/Vagrantfile
@@ -104,7 +104,7 @@ EOF
   config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
     sh.upload_path = "/tmp/vagrant-install-golang"
     sh.env = {
-        'GO_VERSION': ENV['GO_VERSION'] || "1.20.7",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.21.0",
     }
     sh.inline = <<~SHELL
         #!/usr/bin/env bash
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -29,7 +29,7 @@
 #   docker run --privileged containerd-test
 # ------------------------------------------------------------------------------
 
-ARG GOLANG_VERSION=1.20.7
+ARG GOLANG_VERSION=1.21.0
 ARG GOLANG_IMAGE=golang
 
 FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh
@@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
 
 apt-get update && apt-get install -y wget
 cd $SRC
-wget --quiet https://go.dev/dl/go1.19.5.linux-amd64.tar.gz
+wget --quiet https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
 
 mkdir temp-go
 rm -rf /root/.go/*
-tar -C temp-go/ -xzf go1.19.5.linux-amd64.tar.gz
+tar -C temp-go/ -xzf go1.21.0.linux-amd64.tar.gz
 mv temp-go/go/* /root/.go/
 cd $SRC/containerd
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/containerd
 
-go 1.19
+go 1.20
 
 require (
 	dario.cat/mergo v1.0.0
diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1
@@ -5,7 +5,7 @@
 # lived test environment.
 Set-MpPreference -DisableRealtimeMonitoring:$true
 
-$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.7"; make = ""; nssm = "" }
+$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.0"; make = ""; nssm = "" }
 
 Write-Host "Downloading chocolatey package"
 curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"features": {`
`13`	`13`	`"ghcr.io/devcontainers/features/docker-in-docker:2": {},`
`14`	`14`	`"ghcr.io/devcontainers/features/go:1": {`
`15`		`- "version": "1.20"`
	`15`	`+ "version": "1.21"`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ EOF`
`104`	`104`	`config.vm.provision "install-golang", type: "shell", run: "once" do \|sh\|`
`105`	`105`	`sh.upload_path = "/tmp/vagrant-install-golang"`
`106`	`106`	`sh.env = {`
`107`		`- 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.20.7",`
	`107`	`+ 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.21.0",`
`108`	`108`	`}`
`109`	`109`	`sh.inline = <<~SHELL`
`110`	`110`	`#!/usr/bin/env bash`