Skip to content

Commit e0a6f9c

Browse files
committed
update to go 1.16.15, 1.17.8 to address CVE-2022-24921
Addresses [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921) go 1.16.15 -------------------- go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and to the net package. See the Go 1.16.15 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.16.15+label%3ACherryPickApproved full diff: golang/go@go1.16.14...go1.16.15 go 1.17.8 -------------------- go1.17.8 (released 2022-03-03) includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. See the Go 1.17.8 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.17.8+label%3ACherryPickApproved full diff: golang/go@go1.17.7...go1.17.8 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 1c4b24a commit e0a6f9c

10 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/build-test-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040
- uses: actions/setup-go@v2
4141
with:
42-
go-version: '1.17.7'
42+
go-version: '1.17.8'
4343

4444
- uses: actions/checkout@v2
4545
with:

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
go-version: [1.17.7]
23+
go-version: [1.17.8]
2424
os: [ubuntu-18.04, macos-10.15, windows-2019]
2525

2626
steps:
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
- uses: actions/setup-go@v2
4848
with:
49-
go-version: '1.17.7'
49+
go-version: '1.17.8'
5050

5151
- uses: actions/checkout@v2
5252
with:
@@ -78,7 +78,7 @@ jobs:
7878
steps:
7979
- uses: actions/setup-go@v2
8080
with:
81-
go-version: '1.17.7'
81+
go-version: '1.17.8'
8282

8383
- uses: actions/checkout@v2
8484
with:
@@ -110,7 +110,7 @@ jobs:
110110
steps:
111111
- uses: actions/setup-go@v2
112112
with:
113-
go-version: '1.17.7'
113+
go-version: '1.17.8'
114114
- uses: actions/checkout@v2
115115
- run: go install github.com/cpuguy83/go-md2man/[email protected]
116116
- run: make man
@@ -144,7 +144,7 @@ jobs:
144144
steps:
145145
- uses: actions/setup-go@v2
146146
with:
147-
go-version: '1.17.7'
147+
go-version: '1.17.8'
148148
- uses: actions/checkout@v2
149149
- run: |
150150
set -e -x
@@ -201,7 +201,7 @@ jobs:
201201
strategy:
202202
matrix:
203203
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
204-
go-version: ['1.16.14', '1.17.7']
204+
go-version: ['1.16.15', '1.17.8']
205205

206206
steps:
207207
- uses: actions/setup-go@v2
@@ -248,7 +248,7 @@ jobs:
248248
steps:
249249
- uses: actions/setup-go@v2
250250
with:
251-
go-version: '1.17.7'
251+
go-version: '1.17.8'
252252

253253
- uses: actions/checkout@v2
254254
with:
@@ -330,7 +330,7 @@ jobs:
330330
steps:
331331
- uses: actions/setup-go@v2
332332
with:
333-
go-version: '1.17.7'
333+
go-version: '1.17.8'
334334

335335
- uses: actions/checkout@v2
336336

@@ -449,7 +449,7 @@ jobs:
449449
steps:
450450
- uses: actions/setup-go@v2
451451
with:
452-
go-version: '1.17.7'
452+
go-version: '1.17.8'
453453
- uses: actions/checkout@v2
454454
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
455455
- name: Tests

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v2
2828
with:
29-
go-version: 1.17.7
29+
go-version: 1.17.8
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL

.github/workflows/images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/setup-go@v2
2626
with:
27-
go-version: '1.17.7'
27+
go-version: '1.17.8'
2828

2929
- uses: actions/checkout@v2
3030
with:

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.17.7'
21+
go-version: '1.17.8'
2222

2323
- uses: actions/checkout@v2
2424
with:
@@ -135,7 +135,7 @@ jobs:
135135
steps:
136136
- uses: actions/setup-go@v2
137137
with:
138-
go-version: '1.17.7'
138+
go-version: '1.17.8'
139139

140140
- uses: actions/checkout@v2
141141
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install Go
6565
uses: actions/setup-go@v2
6666
with:
67-
go-version: '1.17.7'
67+
go-version: '1.17.8'
6868
- name: Set env
6969
shell: bash
7070
env:

.zuul/playbooks/containerd-build/run.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
become: yes
33
roles:
44
- role: config-golang
5-
go_version: '1.17.7'
5+
go_version: '1.17.8'
66
arch: arm64
77
tasks:
88
- name: Build containerd

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
7777
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
7878
sh.upload_path = "/tmp/vagrant-install-golang"
7979
sh.env = {
80-
'GO_VERSION': ENV['GO_VERSION'] || "1.17.7",
80+
'GO_VERSION': ENV['GO_VERSION'] || "1.17.8",
8181
}
8282
sh.inline = <<~SHELL
8383
#!/usr/bin/env bash

contrib/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.17.7
13+
ARG GOLANG_VERSION=1.17.8
1414
ARG GOLANG_IMAGE=golang
1515

1616
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

script/setup/prepare_env_windows.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Prepare windows environment for building and running containerd tests
22

3-
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.7"; make = ""; nssm = "" }
3+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.8"; make = ""; nssm = "" }
44

55
Write-Host "Downloading chocolatey package"
66
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

0 commit comments

Comments
 (0)