Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.4] Update Go to 1.16.14 #6527

Merged
merged 3 commits into from Feb 15, 2022

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Feb 8, 2022

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: golang/go@go1.16.13...go1.16.14

Update Go to 1.16.13

go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime,
and the net/http package. See the Go 1.16.13 milestone on our issue tracker for
details:

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

go1.16.13 (released 2022-01-06) includes fixes to the compiler, linker, runtime,
and the net/http package. See the Go 1.16.13 milestone on our issue tracker for
details:

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

Not sure if there's gonna be more 1.4.x release, but if so, we may as well have the branch up to date

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: golang/go@go1.16.13...go1.16.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title [release/1.4] Update Go to 1.16.13 [release/1.4] Update Go to 1.16.14 Feb 15, 2022
@estesp
Copy link
Member

estesp commented Feb 15, 2022

Just FYI, something has gotten stale on release/1.4 where the ginko/CRI tests no longer work. I tried to dig into it a bit last week and dead ended after finding the same commits are being used elsewhere. Might need someone more versed in the critest project to help figure it out.

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 15, 2022

Ah, I see it indeed;

ginkgo run failed
    default:   flag provided but not defined: -skipMeasurements

It guess it goes wrong here (as no version is specified);

go get -u github.com/onsi/ginkgo/ginkgo

Possibly something like 6b0e241 would be needed (trying to cherry-pick it, but doesn't apply clean)

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 15, 2022

Build succeeded.

@thaJeztah
Copy link
Member Author

Pushed a commit, roughly based on 6b0e241 (#6328); let's see if that fixes it.

Did a quick check, and ginkgo 1.16.5 looks to still have that flag;

go install github.com/onsi/ginkgo/ginkgo@v1.16.5
#...

ginkgo --help | grep skipMeasurements
  -skipMeasurements

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 15, 2022

Build succeeded.

@thaJeztah
Copy link
Member Author

Hmm... now it looks to be failing in vagrant provisioning

==> default: Running provisioner: install-cri-tools (shell)...
    default: Running: inline script
    default: + /root/go/src/github.com/containerd/containerd/script/setup/install-critools
    default: go: modules disabled by GO111MODULE=off; see 'go help modules'
The SSH command responded with a non-zero exit status. Vagrant
assumes that this means the command failed. The output for this command
should be in the log above. Please read the output to determine what

https://go.dev/doc/go-get-install-deprecation

Based on commit 6b0e241, but modified
to apply to the 1.4 branch.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

Arf.. by bad; I used GO111MODULES (plural) instead of singular 🤦 - fixed

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 15, 2022

Build succeeded.

@estesp
Copy link
Member

estesp commented Feb 15, 2022

nice work; I had looked at that commit too; not sure how I decided that wasn't the source of the issue! :) I did see that recent ginko no longer has that flag but probably got distracted with other work before trying to resolve what version we were using!

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit b5811c7 into containerd:release/1.4 Feb 15, 2022
@thaJeztah thaJeztah deleted the 1.4_update_go branch February 15, 2022 19:07
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.

None yet

5 participants