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

Drop Go 1.13 support, require go 1.15+ #3100

Merged
merged 9 commits into from
Jul 27, 2021

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Jul 20, 2021

Docker/Moby v20.10.8 will bump up Go requirement from 1.13 to 1.16: moby/moby#42643

So we can safely drop support for Go 1.13.

Also, Go 1.14 is no longer supported, so let's settle on Go 1.15+
(which allows to use t.Cleanup and t.TempDir, shaving off some test code).

Go release notes:

Fixes: #3098

AkihiroSuda
AkihiroSuda previously approved these changes Jul 20, 2021
@AkihiroSuda AkihiroSuda added this to the 1.1.0 milestone Jul 20, 2021
@kolyshkin
Copy link
Contributor Author

@thaJeztah PTAL

thaJeztah
thaJeztah previously approved these changes Jul 20, 2021
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

this will be for v1.1.x ? (guess it doesn't really matter, but just out of curiosity)

@kolyshkin
Copy link
Contributor Author

this will be for v1.1.x ? (guess it doesn't really matter, but just out of curiosity)

Yes (definitely not to backport to 1.0.x).

This reverts commit 1a659bc,
essentially reinstating commit d0cbef5.

Signed-off-by: Kir Kolyshkin <[email protected]>
This reverts commit 45f49e8.

Signed-off-by: Kir Kolyshkin <[email protected]>
This mostly reverts commit e2dd922, and bumps
the min Go version to 1.15.

Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
This simplifies the code as no explicit cleanup is required.

Signed-off-by: Kir Kolyshkin <[email protected]>
This simplifies the code as no explicit cleanup is required.

Signed-off-by: Kir Kolyshkin <[email protected]>
1. Use t.TempDir instead of ioutil.TempDir. This means no need for an
   explicit cleanup, which removes some code, including newTestBundle
   and newTestRoot.

2. Move newRootfs invocation down to newTemplateConfig, removing a need
   for explicit rootfs creation. Also, remove rootfs from tParam as it
   is no longer needed (there was a since test case in which two
   containers shared the same rootfs, but it does not look like it's
   required for the test).

Signed-off-by: Kir Kolyshkin <[email protected]>
Replace ioutil.TempDir (mostly) with t.TempDir, which require no
explicit cleanup.

While at it, fix incorrect usage of os.ModePerm in libcontainer/intelrdt
test. This is supposed to be a mask, not mode bits.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin dismissed stale reviews from thaJeztah and AkihiroSuda via a91ce30 July 27, 2021 08:42
@kolyshkin kolyshkin requested a review from AkihiroSuda July 27, 2021 08:42
@kolyshkin
Copy link
Contributor Author

Rebased on top of current master.

Can we please merge it? I have another PR which touches the same code.

Copy link
Member

@cyphar cyphar 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 added the status/merge-on-green Merge on CI green label Jul 27, 2021
@kolyshkin kolyshkin merged commit 1f5f237 into opencontainers:master Jul 27, 2021
@kolyshkin
Copy link
Contributor Author

NOTE this (commit 3bc606e) also implicitly fixes the libct/int/checkpoint issue with criu > 3.15, which I tackled in #3112. In case we ever revert this one, we need a fix from #3112.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop Go 1.13 support
4 participants