Skip to content

[release/1.4] Update Go to 1.16.8#6010

Merged
AkihiroSuda merged 12 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_golang_1.16
Sep 27, 2021
Merged

[release/1.4] Update Go to 1.16.8#6010
AkihiroSuda merged 12 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_golang_1.16

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Sep 15, 2021

This includes additional fixes for CVE-2021-39293.

go1.16.8 (released 2021-09-09) includes a security fix to the archive/zip package,
as well as bug fixes to the archive/zip, go/internal/gccgoimporter, html/template,
net/http, and runtime/pprof packages. See the Go 1.16.8 milestone on the issue
tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.8+label%3ACherryPickApproved

This brings the 1.4 branch to use Go 1.16 (as Go1.15 now reached end of support)

It first reverts the Go updates that were only in the 1.4 release branch:

Then backports the Go 1.16 PRs (so that commit history preserves their descriptions):

Where needed, a manual find/replace was done after each, and conflicts resolved (files that were not yet in 1.4 or unrelated changes in CI/GHA)

An extra commit was added as well to disable go modules where needed (go1.16 is quite aggressive in enforcing modules)

git revert -s -S 2009fa71eade66d669521e9f784d447987b87106 287fd67ae3f84c6ff07403add6acea14ff19d268 d02ed46d276c8e7ab0de3121dd6a3749de9cf0eb ac87e05f617856c9b0a1e84d76967bc9d2b759c2
git cherry-pick -s -S -x c55492f8deb313165d1f7d79cb1a08e1ca14b494
git cherry-pick -s -S -x 8cbef0fade879bab9a331787acba4e4346c6b7f4
git cherry-pick -s -S -x fbe1e140f232f2b3bccba6ace178658783b4a70a
git cherry-pick -s -S -x 79d800b9b0148ae209d164420f723311e93dbb4e
git cherry-pick -s -S -x e72046f86bc54dfda54fdd9b17955ecae4232cca
git cherry-pick -s -S -x 42a28ad2ca7faecfa3e2024952781136211c1fbf

This reverts commit 2009fa7.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
This reverts commit 287fd67.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
This reverts commit d02ed46.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
This reverts commit ac87e05.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from e1243c0 to 028038f Compare September 15, 2021 14:36
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from 028038f to 81c0d5b Compare September 15, 2021 14:55
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from 81c0d5b to 76d3a5b Compare September 15, 2021 15:07
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from 76d3a5b to 25e6507 Compare September 15, 2021 15:23
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from 25e6507 to a39cf41 Compare September 15, 2021 16:24
thaJeztah and others added 8 commits September 15, 2021 18:50
Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit c55492f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit 8cbef0f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
go1.16.3 (released 2021/04/01) includes fixes to the compiler, linker, runtime,
the go command, and the testing and time packages. See the Go 1.16.3 milestone
on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.3+label%3ACherryPickApproved

full diff: golang/go@go1.16.2...go1.16.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit fbe1e14)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
fix [#45710](golang/go#45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <[email protected]>
(cherry picked from commit 79d800b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Release notes: https://golang.org/doc/devel/release#go1.16

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit e72046f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
go1.16.7 (released 2021-08-05) includes a security fix to the net/http/httputil
package, as well as bug fixes to the compiler, the linker, the runtime, the go
command, and the net/http package. See the Go 1.16.7 milestone on the issue
tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.7+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 42a28ad)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
This includes additional fixes for CVE-2021-39293.

go1.16.8 (released 2021-09-09) includes a security fix to the archive/zip package,
as well as bug fixes to the archive/zip, go/internal/gccgoimporter, html/template,
net/http, and runtime/pprof packages. See the Go 1.16.8 milestone on the issue
tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 1.4_update_golang_1.16 branch from a39cf41 to bfe529e Compare September 15, 2021 16:50
@thaJeztah thaJeztah marked this pull request as ready for review September 15, 2021 16:51
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

@thaJeztah thaJeztah closed this Sep 15, 2021
@thaJeztah thaJeztah reopened this Sep 15, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 15, 2021

Build succeeded.

path: src/github.com/Microsoft/hcsshim

- name: Make
env:
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if more changes are needed in the release.yml though (wasn't sure how to test/verify this)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually manually test release.yml changes by pushing a tag to my fork, I can test this one

@thaJeztah
Copy link
Copy Markdown
Member Author

For the record; I wasn't sure if we wanted to update the 1.4 branch to go1.16, but the latest 1.16 releases contain some security fixes (not sure if they affect the containerd code), so I thought I'd open this for consideration (and to see if CI was happy)

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AkihiroSuda AkihiroSuda merged commit f8a9b3b into containerd:release/1.4 Sep 27, 2021
@thaJeztah thaJeztah deleted the 1.4_update_golang_1.16 branch September 27, 2021 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants