Add support for Go Modules by odinuge · Pull Request #2073 · opencontainers/runc

odinuge · 2019-06-18T16:41:36Z

This removes vndr, and swiches to native Go Modules instead. All modules
are kept on the old version.

Keeps the vendor/ dir, so everything is backwards compatible.

This is more or less only go mod init

This would make it way easier for other projects using runc as dependency to keep track of the dependencies (and their version) that runc require.

It would be very nice to get this in before the v1.0.0 release!

vrothberg · 2019-06-19T08:50:18Z

Just a drive-by-comment (I am no maintainer). To make sure that the code and the ./vendor directory are in sync, we are using the following checks in the github.com/containers projects:

Makefile target

vendor:
	export GO111MODULE=on \
		$(GO) mod tidy && \
		$(GO) mod vendor && \
                $(GO) mod verify

Shell script `tree_status.sh`

Checks if the git tree has changed and prints a report.

#!/usr/bin/env bash
set -e

STATUS=$(git status --porcelain)
if [[ -z $STATUS ]]
then
	echo "tree is clean"
else
	echo "tree is dirty, please commit all changes"
	echo ""
	echo "$STATUS"
	exit 1
fi

CI (e.g., Travis)

Both are called in a CI job (make vendor && ./hack/tree_status.sh) to avoid inconsistencies from being committed.

odinuge · 2019-06-19T20:01:25Z

Hi @vrothberg! Thanks for the tips! k8s use the same too, but with a bit more hack-files. 😄

Added a simple check in 4f6014b now.

thaJeztah · 2019-06-19T22:47:20Z

similar discussion about validation in distribution/distribution#2941 (comment) (haven't checked if one has advantages over the other)

vrothberg · 2019-06-20T09:28:32Z

similar discussion about validation in docker/distribution#2941 (comment) (haven't checked if one has advantages over the other)

Awesome!

vrothberg · 2019-06-20T09:29:30Z

Hi @vrothberg! Thanks for the tips! k8s use the same too, but with a bit more hack-files. smile

Added a simple check in 4f6014b now.

LGTM, thanks!

AkihiroSuda · 2019-07-14T06:11:57Z

needs rebase

nathanjsweet · 2019-08-27T19:35:11Z

~~@vrothberg~~ @odinuge do you need help to get this going? Definitely bother the devs on the slack channel to get this across the finish line. To any of the OCI devs: it's harder to contribute to, use, etc this repository without go modules.

odinuge · 2019-08-28T11:59:51Z

Thanks for the interest @nathanjsweet!

do you need help to get this going?
I think this should be good to go now (tests fail because of some problems installing postgres in CI), but I am absolutely open for suggestions. I have stopped rebasing the PR when conflicts occur in await for some interest from the contributors/reviewers from OCI. Hopefully some of them will look at it, so we can get go modules into the project.

Definitely bother the devs on the slack channel to get this across the finish line. To any of the OCI devs: it's harder to contribute to, use, etc this repository without go modules.

Agree! Have been using this in several projects myself, including k8s, and go modules (and a new release) will help the developer experience a lot!

odinuge · 2019-08-28T12:03:52Z

I also think #2029 is kinda important, and that PR should be merged before this one.

odinuge · 2019-08-28T12:07:13Z

ping @mrunalp

saschagrunert · 2019-11-13T10:23:11Z

@odinuge can you please rebase on top of the latest master branch? Then I would give this one a review if you don't mind. :)

AkihiroSuda · 2019-11-13T11:01:54Z

+	$(GO) mod vendor && \
+	$(GO) mod verify
+
+vendor-verify: vendor


this should be put to the validate target?

Yes! Thanks for catching it. Updated the PR now.

hqhq · 2020-03-06T07:37:30Z

LGTM

Use go modules makes sence to me, but I'm not sure why we are not using it in the first place, I think more maintainers should be aware of this change before merge.
@crosbymichael @mrunalp @cyphar

h-vetinari · 2020-03-06T08:05:55Z

@hqhq: [...] but I'm not sure why we are not using it in the first place [...]

Go modules became mature with Go 1.13 (released Sept '19), and this PR has been open since June 19. Together with the usual turnaround time for reviews here, that already seems like more than enough explanation to me... 😅

hqhq · 2020-03-06T09:00:11Z

@hqhq: [...] but I'm not sure why we are not using it in the first place [...]

Go modules became mature with Go 1.13 (released Sept '19), and this PR has been open since June 19. Together with the usual turnaround time for reviews here, that already seems like more than enough explanation to me... 😅

I see, thanks for explain. BTW does this mean we are not able to build runc without go 1.13 or newer?

odinuge · 2020-03-06T09:41:12Z

I see, thanks for explain. BTW does this mean we are not able to build runc without go 1.13 or newer?

We still keep the vendor/ directory with all the dependencies, so it will still work the same for pre go 1.13.

h-vetinari · 2020-03-06T17:02:57Z

Another conflict has arisen, unfortunately (due to merging #2222).

This removes vndr, and swiches to native Go Modules instead. All modules are kept on the old version. Keeps the vendor/ dir, so everything is backwards compatible. Signed-off-by: Odin Ugedal <odin@ugedal.com>

Signed-off-by: Odin Ugedal <odin@ugedal.com>

odinuge · 2020-03-07T09:48:33Z

Another conflict has arisen, unfortunately (due to merging #2222).

Ahh. Updated the PR now.

Since #2222 started building with go 1.14, and require it to pass, I switched back to running the vendoring in 1.14. If we vendor with go 1.13, go build will fail on go 1.14, making the tests fil.

AkihiroSuda · 2020-03-07T12:52:44Z

LGTM

AkihiroSuda · 2020-03-12T09:16:58Z

ping @opencontainers/runc-maintainers PTAL

AkihiroSuda · 2020-03-16T00:36:02Z

I'll merge this on Wednesday unless there are any objections

cyphar · 2020-03-16T01:38:19Z

LGTM. I do have some hesitation about some of the administrative aspects of Go modules (I've had issues with updating individual dependencies before, as well as problems with go mod vendor stripping out some source files that Debian needed) but we should still switch.

Background: opencontainers#2073 (comment) > switched back to running the vendoring in 1.14. If we vendor with go > 1.13, go build will fail on go 1.14, making the tests fil. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

odinuge force-pushed the modules branch 4 times, most recently from 38676c6 to 4fc7a7c Compare June 18, 2019 18:47

odinuge force-pushed the modules branch from 2c2e2eb to 4f6014b Compare June 19, 2019 19:59

odinuge force-pushed the modules branch 2 times, most recently from 2f0088d to f66aadc Compare June 19, 2019 20:55

odinuge force-pushed the modules branch from f66aadc to 293d604 Compare June 20, 2019 18:08

odinuge force-pushed the modules branch 4 times, most recently from ca160ae to 5919d16 Compare August 28, 2019 11:07

odinuge mentioned this pull request Nov 13, 2019

Consider switching to go modules #2171

Closed

odinuge force-pushed the modules branch 3 times, most recently from 09817b6 to e9d5615 Compare November 13, 2019 10:53

AkihiroSuda reviewed Nov 13, 2019

View reviewed changes

odinuge force-pushed the modules branch 2 times, most recently from 6f55ffc to cc22645 Compare November 13, 2019 13:19

AkihiroSuda mentioned this pull request Mar 6, 2020

vendor: update go-systemd and godbus #2242

Merged

odinuge added 6 commits March 7, 2020 09:29

Add support for GO Modules

69e8fb2

This removes vndr, and swiches to native Go Modules instead. All modules are kept on the old version. Keeps the vendor/ dir, so everything is backwards compatible. Signed-off-by: Odin Ugedal <odin@ugedal.com>

Update spec test to use go.mod

3827354

Signed-off-by: Odin Ugedal <odin@ugedal.com>

Fix file permissions for mounts.bats

df583b4

Signed-off-by: Odin Ugedal <odin@ugedal.com>

Make CI script to verify that vendor is in sync

a08ab87

Signed-off-by: Odin Ugedal <odin@ugedal.com>

Remove refrences to vndr

f7edcc3

Signed-off-by: Odin Ugedal <odin@ugedal.com>

Don't add git utils to go.mod in CI

83f9b88

Signed-off-by: Odin Ugedal <odin@ugedal.com>

odinuge force-pushed the modules branch from 2b7564d to 4768beb Compare March 7, 2020 08:32

Run verify-dependencies only on go1.x

777f97d

Signed-off-by: Odin Ugedal <odin@ugedal.com>

odinuge force-pushed the modules branch from 4768beb to 777f97d Compare March 7, 2020 09:46

h-vetinari mentioned this pull request Mar 9, 2020

Is there any plan to turn to go mod? #2247

Closed

AkihiroSuda added enhancement easy-to-review labels Mar 9, 2020

cyphar closed this in a15d2c3 Mar 16, 2020

cyphar merged commit a15d2c3 into opencontainers:master Mar 16, 2020

kolyshkin mentioned this pull request Mar 16, 2020

Use faster mountinfo parser (part 1) #2256

Merged

2 tasks

AkihiroSuda mentioned this pull request Mar 28, 2020

update vendor #2268

Merged

Conversation

odinuge commented Jun 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrothberg commented Jun 19, 2019

Makefile target

Shell script tree_status.sh

CI (e.g., Travis)

Uh oh!

odinuge commented Jun 19, 2019

Uh oh!

thaJeztah commented Jun 19, 2019

Uh oh!

vrothberg commented Jun 20, 2019

Uh oh!

vrothberg commented Jun 20, 2019

Uh oh!

AkihiroSuda commented Jul 14, 2019

Uh oh!

nathanjsweet commented Aug 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

odinuge commented Aug 28, 2019

Uh oh!

odinuge commented Aug 28, 2019

Uh oh!

odinuge commented Aug 28, 2019

Uh oh!

saschagrunert commented Nov 13, 2019

Uh oh!

AkihiroSuda Nov 13, 2019

Choose a reason for hiding this comment

Uh oh!

odinuge Nov 13, 2019

Choose a reason for hiding this comment

Uh oh!

hqhq commented Mar 6, 2020 • edited by AkihiroSuda Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

h-vetinari commented Mar 6, 2020

Uh oh!

hqhq commented Mar 6, 2020

Uh oh!

odinuge commented Mar 6, 2020

Uh oh!

h-vetinari commented Mar 6, 2020

Uh oh!

odinuge commented Mar 7, 2020

Uh oh!

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

Uh oh!

Uh oh!

AkihiroSuda commented Mar 12, 2020

Uh oh!

AkihiroSuda commented Mar 16, 2020

Uh oh!

cyphar commented Mar 16, 2020 • edited by AkihiroSuda Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

odinuge commented Jun 18, 2019 •

edited

Loading

Shell script `tree_status.sh`

nathanjsweet commented Aug 27, 2019 •

edited

Loading

hqhq commented Mar 6, 2020 •

edited by AkihiroSuda

Loading

AkihiroSuda commented Mar 7, 2020 •

edited

Loading

cyphar commented Mar 16, 2020 •

edited by AkihiroSuda

Loading