Merge pull request #8957 from AkihiroSuda/go-1.21

Go 1.21.0
This commit is contained in:
Akihiro Suda 2023-08-19 02:51:58 +09:00 committed by GitHub
commit 4033add994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 87 additions and 46 deletions

View File

@ -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"
}
},

View File

@ -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:

View File

@ -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
@ -203,13 +203,13 @@ jobs:
binaries:
name: Binaries
runs-on: ${{ matrix.os }}
timeout-minutes: 10
timeout-minutes: 20
needs: [project, linters, protos, man]
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:
@ -218,6 +218,12 @@ jobs:
- uses: actions/checkout@v3
# NOTE(aznashwan): starting with Golang 1.21, the windows-2019 GitHub runner's
# builtin MinGW version leads to DLL loading errors during runtime.
- name: Upgrade MinGW on Windows 2019
if: matrix.os == 'windows-2019'
run: choco upgrade mingw
- name: Make
run: |
make build
@ -269,6 +275,12 @@ jobs:
- run: script/setup/install-dev-tools
# NOTE(aznashwan): starting with Golang 1.21, the windows-2019 GitHub runner's
# builtin MinGW version leads to DLL loading errors during runtime.
- name: Upgrade MinGW on Windows 2019
if: matrix.os == 'windows-2019'
run: choco upgrade mingw
- name: Binaries
env:
CGO_ENABLED: 1

View File

@ -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

View File

@ -4,33 +4,49 @@ permissions: # added using https://github.com/step-security/secure-workflows
contents: read
jobs:
# Run all fuzzing tests. Some of them use Go 1.18's testing.F.
# Others use https://github.com/AdaLogics/go-fuzz-headers.
ci_fuzz:
name: CI Fuzz
if: github.repository == 'containerd/containerd'
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Build Fuzzers
id: build
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
with:
oss-fuzz-project-name: 'containerd'
language: go
- name: Run Fuzzers
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
with:
oss-fuzz-project-name: 'containerd'
fuzz-seconds: 300
language: go
continue-on-error: true
- name: Upload Crash
uses: actions/upload-artifact@v1
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
path: ./out/artifacts
# ci_fuzz is temporarily disabled as it is not compatible with recent Go:
#
#####
# >github.com/containerd/containerd/contrib/apparmor
# >github.com/containerd/containerd/contrib/apparmor
# >Running go-fuzz -tags gofuzz -func FuzzLoadDefaultProfile -o fuzz_FuzzLoadDefaultProfile.a github.com/containerd/containerd/contrib/apparmor
# >/usr/bin/ld: /usr/bin/ld: DWARF error: invalid or unhandled FORM value: 0x25
# >fuzz_FuzzLoadDefaultProfile.a(000021.o): in function `_cgo_9c8efe9babca_C2func_res_search':
# >cgo_unix_cgo_res.cgo2.c:(.text+0x32): undefined reference to `__res_search'
# >/usr/bin/ld: fuzz_FuzzLoadDefaultProfile.a(000021.o): in function `_cgo_9c8efe9babca_Cfunc_res_search':
# >cgo_unix_cgo_res.cgo2.c:(.text+0x81): undefined reference to `__res_search'
# >clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
# >2023-08-11 14:25:45,433 - root - ERROR - Building fuzzers failed.
# >2023-08-11 14:25:45,433 - root - ERROR - Error building fuzzers for (commit: 432d86b87f75cc8ddf8f8101a5540eb206ffc894, pr_ref: refs/pull/8957/merge).
#####
#
# # Run all fuzzing tests. Some of them use Go 1.18's testing.F.
# # Others use https://github.com/AdaLogics/go-fuzz-headers.
# ci_fuzz:
# name: CI Fuzz
# if: github.repository == 'containerd/containerd'
# runs-on: ubuntu-latest
# timeout-minutes: 60
# steps:
# - name: Build Fuzzers
# id: build
# uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
# with:
# oss-fuzz-project-name: 'containerd'
# language: go
# - name: Run Fuzzers
# uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
# with:
# oss-fuzz-project-name: 'containerd'
# fuzz-seconds: 300
# language: go
# continue-on-error: true
# - name: Upload Crash
# uses: actions/upload-artifact@v1
# if: failure() && steps.build.outcome == 'success'
# with:
# name: artifacts
# path: ./out/artifacts
# Make sure all fuzzing tests which use Go 1.18's testing.F are
# runnable with go test -fuzz.
@ -42,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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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.

2
Vagrantfile vendored
View File

@ -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

View File

@ -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

View File

@ -39,6 +39,11 @@ func WithProfile(profile string) oci.SpecOpts {
// WithDefaultProfile will generate a default apparmor profile under the provided name
// for the container. It is only generated if a profile under that name does not exist.
//
// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline
// since Go 1.21.
//
//go:noinline
func WithDefaultProfile(name string) oci.SpecOpts {
return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error {
if err := LoadDefaultProfile(name); err != nil {

View File

@ -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

View File

@ -30,6 +30,11 @@ import (
// WithProfile receives the name of a file stored on disk comprising a json
// formatted seccomp profile, as specified by the opencontainers/runtime-spec.
// The profile is read from the file, unmarshaled, and set to the spec.
//
// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline
// since Go 1.21.
//
//go:noinline
func WithProfile(profile string) oci.SpecOpts {
return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error {
s.Linux.Seccomp = &specs.LinuxSeccomp{}
@ -46,6 +51,11 @@ func WithProfile(profile string) oci.SpecOpts {
// WithDefaultProfile sets the default seccomp profile to the spec.
// Note: must follow the setting of process capabilities
//
// FIXME: pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline
// since Go 1.21.
//
//go:noinline
func WithDefaultProfile() oci.SpecOpts {
return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error {
s.Linux.Seccomp = DefaultProfile(s)

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/containerd/containerd
go 1.19
go 1.20
require (
dario.cat/mergo v1.0.0

View File

@ -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'