[release/1.6] Backport easy go install and update go #9890

austinvazquez · 2024-02-27T16:35:04Z

Issue

N/A

The release/1.6 branch is building with slightly older Go version. This change is bring the Go support more inline with mainline.

Description

Follow-up to #9877. This change backports:

0f043ae - seccomp, apparmor: add go:noinline
c883410 - upgrade mingw on Windows 2019 GitHub runners
21640c5 - uninstall mingw before upgrade
32bd8ef - move inline PS scripts into files
76d68b0 - container_stat_test.go: avoid checking snapshot size
82d6c2f - revert container_stats_test.go change which caused Windows CRI integration test failure
871b6b6 - use testify
a5d9587 - update to go1.21.6, go1.20.13
488b563 - composite Go action to simplify Go installation across all CI workflows.
87aa9e8 - updates default Go to Go v1.21.6 and adds Go v1.22.0 to matrix.

Testing

PR runs workflows

k8s-ci-robot · 2024-02-27T16:35:15Z

Hi @austinvazquez. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

.github/workflows/ci.yml

austinvazquez · 2024-02-27T22:48:17Z

Seeing some integration test failures which is not clear to me. Let me pull out the compiler updates to see if issue persists.

austinvazquez · 2024-02-29T16:50:04Z

There seems to be an issue running the integration tests with the new toolchain on the older platforms.

akhilerm · 2024-02-29T17:08:30Z

FYI, there is a go.mod in integration/client. You may want to update that files too.

akhilerm · 2024-03-01T17:51:58Z

There seems to be an issue running the integration tests with the new toolchain on the older platforms.

@austinvazquez You can cherry-pick 0f043ae to fix the tests

austinvazquez · 2024-03-01T21:17:50Z

@austinvazquez You can cherry-pick 0f043ae to fix the tests

Wow @akhilerm great find. I don't think I would have got there without help. The issue sounds complex. Cherry-picked and pushed with latest. Will publish PR if CI looks good.

akhilerm · 2024-03-05T02:29:37Z

For the failure of tests on windows-2019, you may want to refer to these commits and make the changes acordingly.

austinvazquez · 2024-03-05T16:43:55Z

Fix one failing test two more take its place. 😅

Windows integration tests seem to be in a good place now after a few more backports. Updated the description with the backports needed so far.

Linux integration tests are now failing for:

=== Failed
=== FAIL: sys TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect (0.00s)
    oom_linux_test.go:58: 
        	Error Trace:	/home/runner/work/containerd/containerd/sys/oom_linux_test.go:58
        	Error:      	Not equal: 
        	            	expected: -123
        	            	actual  : 500
        	Test:       	TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect

Good news is all the test are consistently failing with this one error, so there seems to be light at the end of the tunnel. Going to keep chasing it down more.

austinvazquez · 2024-03-06T17:45:03Z

Hey folks, kicking and screaming this one. 😅

It looks like others are also seeing the OOM integration test failures on release/1.6 and even now showing in mainline. See #9939

akhilerm · 2024-03-07T11:06:52Z

Can you rebase the PR with release/1.6. That should make the CI go green. We can try to get this merged before #9934.

Tests in pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline since Go 1.21. e.g., > ``` > === FAIL: pkg/cri/sbserver TestGenerateSeccompSecurityProfileSpecOpts/should_set_default_seccomp_when_seccomp_is_runtime/default (0.00s) > container_create_linux_test.go:1013: > Error Trace: /home/runner/work/containerd/containerd/pkg/cri/sbserver/container_create_linux_test.go:1013 > Error: Not equal: > expected: 0x263d880 > actual : 0x263cbc0 > Test: TestGenerateSeccompSecurityProfileSpecOpts/should_set_default_seccomp_when_seccomp_is_runtime/default > ``` See comments in PR 8957. Thanks to Wei Fu for analyzing this. Co-authored-by: Wei Fu <fuweid89@gmail.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 0f043ae) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

The default version of MinGW and GCC on the GitHub-hosted Windows 2019 runners compile fine but lead to linker errors during runtime. Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com> (cherry picked from commit c883410) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 21640c5) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 32bd8ef) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

On Linux, the snapshot size differs depending on the backing filesystem. See issue 7909. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 76d68b0) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

…ation test failure PR containerd#7892 which supposed to fix issue on Linux introduced random failure on Windows, this commit is to revert that change for Windows platform Signed-off-by: Tony Fang <nenghui.fang@gmail.com> (cherry picked from commit 82d6c2f) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 871b6b6) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

go1.21.6 (released 2024-01-09) includes fixes to the compiler, the runtime, and the crypto/tls, maps, and runtime/pprof packages. See the Go 1.21.6 milestone on our issue tracker for details: - https://github.com/golang/go/issues?q=milestone%3AGo1.21.6+label%3ACherryPickApproved - full diff: golang/go@go1.21.5...go1.21.6 go1.20.13 (released 2024-01-09) includes fixes to the runtime and the crypto/tls package. See the Go 1.20.13 milestone on our issue tracker for details: - https://github.com/golang/go/issues?q=milestone%3AGo1.20.13+label%3ACherryPickApproved - full diff: golang/go@go1.20.12...go1.20.13 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a5d9587) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 488b563) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 87aa9e8) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

akhilerm · 2024-03-07T23:31:50Z

.github/workflows/ci.yml

The GO_VERSION env needs to be removed from this file.

Dang, yep that is a miss, let me get a change out to resolve.

k8s-ci-robot added do-not-merge/work-in-progress needs-ok-to-test size/L labels Feb 27, 2024

austinvazquez commented Feb 27, 2024

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch from 7d4ed6f to 4868bd3 Compare February 27, 2024 16:43

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch from 4868bd3 to a66b58e Compare February 27, 2024 22:48

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch from 94bf584 to 410c66b Compare March 1, 2024 21:13

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch 3 times, most recently from c0795f5 to 71b12e0 Compare March 5, 2024 15:21

k8s-ci-robot added size/XL and removed size/L labels Mar 5, 2024

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch 2 times, most recently from ba25513 to 6cb5a78 Compare March 5, 2024 15:26

k8s-ci-robot added size/XXL and removed size/XL labels Mar 5, 2024

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch 3 times, most recently from b24addc to 987b464 Compare March 5, 2024 16:18

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch 3 times, most recently from 19ccda1 to 1f54d6d Compare March 6, 2024 17:19

austinvazquez marked this pull request as ready for review March 6, 2024 17:45

k8s-ci-robot removed the do-not-merge/work-in-progress label Mar 6, 2024

AkihiroSuda and others added 9 commits March 7, 2024 20:12

Uninstall mingw before attempting upgrade

74bae5a

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 21640c5) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Move inline PS scripts into files

935720b

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 32bd8ef) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Use testify

da5a36c

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 871b6b6) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

Extract a composite action to install Go

7c45ad0

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 488b563) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch from 1f54d6d to b6e4952 Compare March 7, 2024 20:13

Drop go 1.20 and build against 1.22

f6475ea

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 87aa9e8) Signed-off-by: Austin Vazquez <macedonv@amazon.com>

austinvazquez force-pushed the release-1.6-backport-easy-go-install-and-update-go branch from b6e4952 to f6475ea Compare March 7, 2024 20:41

estesp approved these changes Mar 7, 2024

View reviewed changes

dmcgowan approved these changes Mar 7, 2024

View reviewed changes

dmcgowan merged commit e826d58 into containerd:release/1.6 Mar 7, 2024

austinvazquez deleted the release-1.6-backport-easy-go-install-and-update-go branch March 7, 2024 23:21

akhilerm reviewed Mar 7, 2024

View reviewed changes

This was referenced Mar 7, 2024

[release/1.6] Update builds to go 1.21.8 #9945

Merged

[release/1.6] use a composite action to install Go #9949

Merged

dmcgowan mentioned this pull request Mar 8, 2024

[release/1.6] Prepare v1.6.30 #9952

Merged

austinvazquez mentioned this pull request Mar 10, 2024

[release/1.6] Backport test release on PR #9955

Merged

[release/1.6] Backport easy go install and update go #9890

[release/1.6] Backport easy go install and update go #9890

Uh oh!

Conversation

austinvazquez commented Feb 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue

Description

Testing

Uh oh!

k8s-ci-robot commented Feb 27, 2024

Uh oh!

Uh oh!

austinvazquez commented Feb 27, 2024

Uh oh!

austinvazquez commented Feb 29, 2024

Uh oh!

akhilerm commented Feb 29, 2024

Uh oh!

akhilerm commented Mar 1, 2024

Uh oh!

austinvazquez commented Mar 1, 2024

Uh oh!

akhilerm commented Mar 5, 2024

Uh oh!

austinvazquez commented Mar 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

austinvazquez commented Mar 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akhilerm commented Mar 7, 2024

Uh oh!

akhilerm Mar 7, 2024

Choose a reason for hiding this comment

Uh oh!

austinvazquez Mar 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

austinvazquez commented Feb 27, 2024 •

edited

Loading

austinvazquez commented Mar 5, 2024 •

edited

Loading

austinvazquez commented Mar 6, 2024 •

edited

Loading

austinvazquez Mar 7, 2024 •

edited

Loading