From 24b9912e8f51fc51a2c0d80010b68527efb7a7bf Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 15 Feb 2022 16:31:46 +0100 Subject: [PATCH] [release/1.5] Update Go to 1.16.14 Includes security fixes for crypto/elliptic (CVE-2022-23806), math/big (CVE-2022-23772), and cmd/go (CVE-2022-23773). go1.16.14 (released 2022-02-10) includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, net/http/httptest, and testing packages. See the Go 1.16.14 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.16.14+label%3ACherryPickApproved full diff: https://github.com/golang/go/compare/go1.16.13...go1.16.14 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .../containerd-build/integration-test.yaml | 2 +- .zuul/playbooks/containerd-build/run.yaml | 2 +- .../playbooks/containerd-build/unit-test.yaml | 2 +- Vagrantfile | 2 +- contrib/Dockerfile.test | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb9b92dea99e..208264904309 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.16.13] + go-version: [1.16.14] os: [ubuntu-18.04, macos-10.15, windows-2019] steps: @@ -56,7 +56,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - shell: bash run: | @@ -87,7 +87,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - name: Set env shell: bash @@ -166,7 +166,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - name: Set env shell: bash run: | @@ -231,7 +231,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15, windows-2019] - go-version: ['1.16.13'] + go-version: ['1.16.14'] include: # Go 1.13.x is still used by Docker/Moby - go-version: '1.13.x' @@ -277,7 +277,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: @@ -358,7 +358,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: @@ -510,7 +510,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: path: src/github.com/containerd/containerd diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 439023fa2464..7036fdd94ca1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38a085d02550..1945e361d391 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.16.13' + go-version: '1.16.14' - name: Set env shell: bash diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index b714a775ca87..39b6aa643b0c 100644 --- a/.zuul/playbooks/containerd-build/integration-test.yaml +++ b/.zuul/playbooks/containerd-build/integration-test.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.13' + go_version: '1.16.14' arch: arm64 tasks: - name: Install pre-requisites diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index c5b4b7a39a66..50700a4d3cf2 100644 --- a/.zuul/playbooks/containerd-build/run.yaml +++ b/.zuul/playbooks/containerd-build/run.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.13' + go_version: '1.16.14' arch: arm64 tasks: - name: Build containerd diff --git a/.zuul/playbooks/containerd-build/unit-test.yaml b/.zuul/playbooks/containerd-build/unit-test.yaml index 2f75e812712e..b18c7270836e 100644 --- a/.zuul/playbooks/containerd-build/unit-test.yaml +++ b/.zuul/playbooks/containerd-build/unit-test.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.13' + go_version: '1.16.14' arch: arm64 tasks: - name: Build and test containerd diff --git a/Vagrantfile b/Vagrantfile index 3a70318a505d..e294fe111f5c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -77,7 +77,7 @@ Vagrant.configure("2") do |config| 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.16.13", + 'GO_VERSION': ENV['GO_VERSION'] || "1.16.14", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 3a487412f49c..869acd9b1ee1 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -10,7 +10,7 @@ # # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../ -ARG GOLANG_VERSION=1.16.13 +ARG GOLANG_VERSION=1.16.14 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd