Move to Go modules by zhsj · Pull Request #4760 · containerd/containerd

zhsj · 2020-11-21T15:23:38Z

Updates #3031

k8s-ci-robot · 2020-11-21T15:23:47Z

Hi @zhsj. 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.

theopenlab-ci · 2020-11-21T15:35:26Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 10m 08s (non-voting)

theopenlab-ci · 2020-11-21T15:51:12Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 8m 13s (non-voting)

theopenlab-ci · 2020-11-21T16:18:49Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 8m 28s (non-voting)

theopenlab-ci · 2020-11-21T16:47:17Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 51s (non-voting)

theopenlab-ci · 2020-11-21T17:24:34Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 7m 33s (non-voting)

zhsj · 2020-11-21T17:37:27Z

Two things are left which will be addressed in later PR:

doc clean up
bump protobuf and grpc version.
This is needed, so we can drop replace in go.mod. The replace is inconvenient for downstream users, they need copy all the replace to their go.mod.

theopenlab-ci · 2020-11-21T17:45:12Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 59s (non-voting)

zhsj · 2020-11-21T18:04:39Z

Use release-tools to compare the libraries with master:

github.com/Microsoft/go-winio v0.4.14 -> 5b44b70ab3ab
github.com/Microsoft/hcsshim/test 966bebae11b4 new
github.com/fullsailor/pkcs7 8306686428a5 -> d7302db945fa
github.com/golang/groupcache 215e87163ea7 new
github.com/google/go-cmp v0.2.0 -> v0.5.1
github.com/imdario/mergo v0.3.7 -> v0.3.10
github.com/matttproud/golang_protobuf_extensions v1.0.1 -> c182affec369
github.com/moby/sys/symlink v0.1.0 new
github.com/prometheus/client_golang v1.6.0 -> v1.7.1
github.com/prometheus/common v0.9.1 -> v0.10.0
github.com/prometheus/procfs v0.0.11 -> v0.1.3
github.com/urfave/cli v1.22.1 -> v1.22.2
go.opencensus.io v0.22.0 -> v0.22.2
golang.org/x/sync 42b317875d0f -> 6e8e738ad208
golang.org/x/xerrors 9bdfabe68543 new
google.golang.org/appengine v1.6.5 new
gopkg.in/yaml.v2 v2.2.8 -> v2.3.0

Does the github.com/urfave/cli bug in v1.22.2 affects containerd too? Does containerd has command that accepts -1 as parament like runc?

Edit:

without bump urfave/cli

github.com/Microsoft/go-winio v0.4.14 -> 5b44b70ab3ab
github.com/Microsoft/hcsshim/test 966bebae11b4 new
github.com/fullsailor/pkcs7 8306686428a5 -> d7302db945fa
github.com/golang/groupcache 215e87163ea7 new
github.com/google/go-cmp v0.2.0 -> v0.5.1
github.com/imdario/mergo v0.3.7 -> v0.3.10
github.com/matttproud/golang_protobuf_extensions v1.0.1 -> c182affec369
github.com/moby/sys/symlink v0.1.0 new
github.com/prometheus/client_golang v1.6.0 -> v1.7.1
github.com/prometheus/common v0.9.1 -> v0.10.0
github.com/prometheus/procfs v0.0.11 -> v0.1.3
go.opencensus.io v0.22.0 -> v0.22.2
golang.org/x/sync 42b317875d0f -> 6e8e738ad208
golang.org/x/xerrors 9bdfabe68543 new
google.golang.org/appengine v1.6.5 new
gopkg.in/yaml.v2 v2.2.8 -> v2.3.0

theopenlab-ci · 2020-11-22T09:04:38Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 6m 04s (non-voting)

zhsj · 2020-11-22T09:07:38Z

hmm, the upgrade of google/protobuf is not straightforward, let's leave it to another PR. containerd/ttrpc#62

theopenlab-ci · 2020-11-22T09:15:26Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 52s (non-voting)

theopenlab-ci · 2020-11-22T09:54:24Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 11m 38s (non-voting)

AkihiroSuda · 2020-11-23T15:09:08Z

Does the github.com/urfave/cli bug in v1.22.2 affects containerd too? Does containerd has command that accepts -1 as parament like runc?

Potentially yes. So better to continue using v1.22.1

script/setup/install-runc

go.mod

AkihiroSuda · 2020-11-23T15:12:12Z

LGTM except a couple of nits, thanks for working on this 👍

AkihiroSuda · 2020-11-23T15:24:45Z

/ok-to-test

dims · 2020-11-25T02:50:19Z

go.mod

Can you please add a trailing comment?
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092

the trailing comments get preserved (see the go.mod in kubernetes/kubernetes for examples of how we add some comments)

Added. ~~btw, kubernetes is using v1.22.2~~ never mind, kubernetes doesn't use urfave/cli for command.

theopenlab-ci · 2020-11-25T03:05:57Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 53s (non-voting)

mikebrow

LGTM

dims

LGTM

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test Signed-off-by: Shengjing Zhu <zhsj@debian.org>

So it won't touch go.mod Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

zhsj · 2020-11-30T17:44:49Z

rebased due to conflicts.

theopenlab-ci · 2020-11-30T17:51:45Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 49s (non-voting)

estesp

LGTM

fuweid · 2020-12-02T06:16:37Z

I compared vendor.conf with go.{mod,sum} and found one change (containerd doesn't use github.com/hashicorp/golang-lru directly):

vendor.conf
github.com/hashicorp/golang-lru                     v0.5.3

go.mod
github.com/hashicorp/golang-lru                     v0.5.1

Changes LGTM.

zhsj · 2020-12-02T06:44:59Z

I compared vendor.conf with go.{mod,sum} and found one change (containerd doesn't use github.com/hashicorp/golang-lru directly):

I used release-tool to compare the dependencies. This in not included in vendor/modules.txt, thus release-tool won't check it :)

fuweid · 2020-12-02T07:29:15Z

OK! Thanks @zhsj Great Job.

k8s-ci-robot added the needs-ok-to-test label Nov 21, 2020

AkihiroSuda added this to the 1.5 milestone Nov 21, 2020

AkihiroSuda added the impact/changelog label Nov 21, 2020

zhsj force-pushed the gomod branch from b33af97 to e6de08a Compare November 21, 2020 16:08

zhsj force-pushed the gomod branch from 617e74d to f210969 Compare November 21, 2020 16:39

zhsj marked this pull request as ready for review November 21, 2020 17:37

zhsj force-pushed the gomod branch from 221e9a1 to 357d9d9 Compare November 21, 2020 17:37

zhsj force-pushed the gomod branch from 357d9d9 to f511625 Compare November 22, 2020 08:52

zhsj force-pushed the gomod branch from 71a2f76 to 357d9d9 Compare November 22, 2020 09:08

zhsj force-pushed the gomod branch from 357d9d9 to 68eaa5e Compare November 22, 2020 09:41

AkihiroSuda reviewed Nov 23, 2020

View reviewed changes

script/setup/install-runc Outdated Show resolved Hide resolved

AkihiroSuda reviewed Nov 23, 2020

View reviewed changes

go.mod Outdated Show resolved Hide resolved

zhsj force-pushed the gomod branch from 68eaa5e to 5db666b Compare November 23, 2020 15:20

AkihiroSuda approved these changes Nov 23, 2020

View reviewed changes

dims reviewed Nov 25, 2020

View reviewed changes

mikebrow approved these changes Nov 27, 2020

View reviewed changes

dims approved these changes Nov 30, 2020

View reviewed changes

zhsj added 12 commits December 1, 2020 01:33

Convert vendor.conf to go.mod with go mod init

9aafdbd

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Go mod tidy

89a1fea

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Revert protobuf and grpc version bump

de059b1

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Revert gogo/googleapis version bump

6a2df5f

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Replace vndr in Makefile

089d218

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Fix reference to vendor.conf in scripts

553a369

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Fix hcsshim commit detection

819ac05

Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Change to GOPATH before go get

56672b9

So it won't touch go.mod Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Remove reference of GO111MODULE=off

56eca84

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Don't fail fast in integration matrix test

c129310

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Revert urfave/cli version bump

fc946ca

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

Go mod vendor

7e46676

Signed-off-by: Shengjing Zhu <zhsj@debian.org>

zhsj force-pushed the gomod branch from 0c96df8 to 7e46676 Compare November 30, 2020 17:44

AkihiroSuda approved these changes Dec 1, 2020

View reviewed changes

estesp approved these changes Dec 1, 2020

View reviewed changes

estesp merged commit fbf1a72 into containerd:master Dec 1, 2020

zhsj deleted the gomod branch December 2, 2020 06:46

alexandrevilain mentioned this pull request Dec 6, 2020

CRI conformance tests firecracker-microvm/firecracker-containerd#88

Open

hickeyma mentioned this pull request Dec 7, 2020

Fix(ci): CRI Test with Windows containerd runtime kubernetes-sigs/cri-tools#700

Merged

AkihiroSuda mentioned this pull request Jan 25, 2021

go mod friendly #3031

Closed

16 tasks

thaJeztah mentioned this pull request Mar 16, 2021

go.mod: add warnings about overridden versions #5208

Closed

Conversation

zhsj commented Nov 21, 2020

Uh oh!

k8s-ci-robot commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

zhsj commented Nov 21, 2020

Uh oh!

theopenlab-ci bot commented Nov 21, 2020

Uh oh!

zhsj commented Nov 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci bot commented Nov 22, 2020

Uh oh!

zhsj commented Nov 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci bot commented Nov 22, 2020

Uh oh!

theopenlab-ci bot commented Nov 22, 2020

Uh oh!

AkihiroSuda commented Nov 23, 2020

Uh oh!

Uh oh!

Uh oh!

AkihiroSuda commented Nov 23, 2020

Uh oh!

AkihiroSuda commented Nov 23, 2020

Uh oh!

dims Nov 25, 2020 • 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!

zhsj Nov 25, 2020 • 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!

theopenlab-ci bot commented Nov 25, 2020

Uh oh!

mikebrow left a comment

Choose a reason for hiding this comment

Uh oh!

dims left a comment

Choose a reason for hiding this comment

Uh oh!

zhsj commented Nov 30, 2020

Uh oh!

theopenlab-ci bot commented Nov 30, 2020

Uh oh!

estesp left a comment

Choose a reason for hiding this comment

Uh oh!

fuweid commented Dec 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhsj commented Dec 2, 2020

Uh oh!

fuweid commented Dec 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

zhsj commented Nov 21, 2020 •

edited

Loading

zhsj commented Nov 22, 2020 •

edited

Loading

dims Nov 25, 2020 •

edited

Loading

zhsj Nov 25, 2020 •

edited

Loading

fuweid commented Dec 2, 2020 •

edited

Loading