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

[WIP] Update to latest sha/tag of dependencies #4970

Closed
wants to merge 2 commits into from

Conversation

dims
Copy link
Member

@dims dims commented Jan 25, 2021

Looks like we are lagging behind a bunch of dependencies. Do we want to bump all of them? some of them? In this PR, i've held back

  • gogo/protobuf as it leads to generated code changes
  • google.golang.org/grpc because k/k will break with newer grpc (long story ... etcd needs to be updated first Please upgrade grpc version used in etcd go.mod  etcd-io/etcd#12470)
  • we'll probably need to hold back syndtr/gocapability as one of the CI jobs is broken with it (as it adds CAP_PERFMON)

Updating:

Package Before After URL
github.com/Microsoft/hcsshim/test d3e5debf77da c19ef4bd03a7 microsoft/hcsshim@d3e5deb...c19ef4b
github.com/containerd/aufs dab0cbea06f4 76a6863f2989 containerd/aufs@dab0cbe...76a6863
github.com/containerd/cgroups 0b889c0 8a68de5 containerd/cgroups@0b889c0...8a68de5
github.com/containerd/go-runc 7016d3ce2328 16b287bc67d0 containerd/go-runc@7016d3c...16b287b
github.com/containerd/imgcrypt v1.0.1 v1.0.3 containerd/imgcrypt@v1.0.1...v1.0.3
github.com/containerd/nri eb1350a75164 7669bcbbe8a4 containerd/nri@eb1350a...7669bcb
github.com/containernetworking/plugins v0.8.6 v0.9.0 containernetworking/plugins@v0.8.6...v0.9.0
github.com/emicklei/go-restful v2.9.5 v2.15.0 emicklei/go-restful@v2.9.5...v2.15.0
github.com/google/go-cmp v0.5.1 v0.5.4 google/go-cmp@v0.5.1...v0.5.4
github.com/google/uuid v1.1.1 v1.2.0 google/uuid@v1.1.1...v1.2.0
github.com/hashicorp/go-multierror v1.0.0 v1.1.0 hashicorp/go-multierror@v1.0.0...v1.1.0
github.com/imdario/mergo v0.3.10 v0.3.11 darccio/mergo@v0.3.10...v0.3.11
github.com/klauspost/compress v1.11.3 v1.11.7 klauspost/compress@v1.11.3...v1.11.7
github.com/prometheus/client_golang v1.7.1 v1.9.0 prometheus/client_golang@v1.7.1...v1.9.0
github.com/stretchr/testify v1.4.0 v1.7.0 stretchr/testify@v1.4.0...v1.7.0
github.com/syndtr/gocapability d98352740cb2 42c35b437635 syndtr/gocapability@d983527...42c35b4
github.com/tchap/go-patricia v2.2.6 v2.3.0 tchap/go-patricia@v2.2.6...v2.3.0
github.com/urfave/cli v1.22.2 v1.22.5 urfave/cli@v1.22.2...v1.22.5
golang.org/x/net ab3426394381 5f4716e94777 golang/net@ab34263...5f4716e
golang.org/x/sync 6e8e738ad208 09787c993a3a golang/sync@6e8e738...09787c9
golang.org/x/sys 69691e467435 22da62e12c0c golang/sys@69691e4...22da62e
gotest.tools/v3 v3.0.2 v3.0.3 gotestyourself/gotest.tools@v3.0.2...v3.0.3

Not yet ready for the following as Kubernetes and etcd will break:

Package Before After URL
github.com/gogo/protobuf v1.3.1 v1.3.2 gogo/protobuf@v1.3.1...v1.3.2
google.golang.org/grpc v1.30.0 v1.35.0 https://google.golang.org/grpc/compare/v1.30.0...v1.35.0

@dims dims force-pushed the update-to-latest-sha/tag branch 2 times, most recently from de73b82 to 5da3950 Compare January 25, 2021 22:08
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Jan 25, 2021

Build succeeded.

@dims dims changed the title [NOT READY FOR REVIEW][WIP] Update to latest sha/tag of dependencies Update to latest sha/tag of dependencies Jan 26, 2021
@dims
Copy link
Member Author

dims commented Jan 26, 2021

@mikebrow WDYT?

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

couple comments thx @dims

github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
github.com/containerd/imgcrypt v1.0.1
github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
Copy link
Member

Choose a reason for hiding this comment

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

needs updated but probably need to update go-runc first.. to grab the latest runtime spec

Copy link
Member

Choose a reason for hiding this comment

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

Looks like it's already on latest runtime spec (v1.0.2); https://github.com/containerd/go-runc/blob/16b287bc67d0/go.mod#L7

That said, it should currently pick the runtime we specified in our go.mod, because we use vendoring (in which case the vendored version is used, not "multi version" modules).

Also had a quick look, because some changes in this dependency update are related to #4526. Unfortunately those aren't the last commits (otherwise it would've been good to pick a slightly older commit, and include the "last few commits" in the related (#4526) pull request

github.com/containerd/ttrpc v1.0.2
github.com/containerd/typeurl v1.0.1
github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2
github.com/containernetworking/plugins v0.8.6
github.com/containernetworking/plugins v0.9.0
Copy link
Member

Choose a reason for hiding this comment

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

let's do this one in a separate pr and put something in the description about containernetworking/plugins#540 which is a behavior change

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.

Thanks! And thanks for the nice table!

Left some comments inline. Also wondering if we should try to split to individual commits; there's a lot of dependencies being updated, and in case there's a regression, having separate commits could potentially help doing a git bisect

As to your comments;

gogo/protobuf as it leads to generated code changes

Agreed; better to keep separate

google.golang.org/grpc because k/k will break with newer grpc (long story ... etcd needs to be updated first etcd-io/etcd#12470)

Also agreed; best kept separate in general, as it's potentially risky to update

we'll probably need to hold back syndtr/gocapability as one of the CI jobs is broken with it (as it adds CAP_PERFMON)

That one is tricky indeed; see opencontainers/runtime-spec#1071 and moby/moby#41563
There's also an existing PR to update it #4919

github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
github.com/containerd/imgcrypt v1.0.1
github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
Copy link
Member

Choose a reason for hiding this comment

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

Looks like it's already on latest runtime spec (v1.0.2); https://github.com/containerd/go-runc/blob/16b287bc67d0/go.mod#L7

That said, it should currently pick the runtime we specified in our go.mod, because we use vendoring (in which case the vendored version is used, not "multi version" modules).

Also had a quick look, because some changes in this dependency update are related to #4526. Unfortunately those aren't the last commits (otherwise it would've been good to pick a slightly older commit, and include the "last few commits" in the related (#4526) pull request

github.com/imdario/mergo v0.3.10
github.com/klauspost/compress v1.11.3
github.com/hashicorp/go-multierror v1.1.0
github.com/imdario/mergo v0.3.11
Copy link
Member

Choose a reason for hiding this comment

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

Just a heads-up (diff looks ok); we had an issue reported with a panic in this dependency; not sure if the version we're using here currently is affected docker/cli#2916 (haven't dug into the issue yet, so really just a heads up)

github.com/urfave/cli v1.22.2
github.com/stretchr/testify v1.7.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
github.com/tchap/go-patricia v2.3.0+incompatible
Copy link
Member

Choose a reason for hiding this comment

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

Looks to only include a new feature, no bug fixes, so not "strictly" needed if we want to reduce code-churn.

github.com/stretchr/testify v1.7.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
github.com/tchap/go-patricia v2.3.0+incompatible
github.com/urfave/cli v1.22.5
Copy link
Member

Choose a reason for hiding this comment

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

Note that there's a regression in v1.22.2 and up; see https://github.com/opencontainers/runc/blob/cb269306807dcfd7f742c8444aca2e638bd81550/go.mod#L22-L23

Might affect ctr as well (if so, we may want to pin to the older version). I have a PR pending urfave/cli#1135, but time got the best of me to revisit it

@dims dims changed the title Update to latest sha/tag of dependencies [WIP] Update to latest sha/tag of dependencies Jan 27, 2021
@dims dims closed this Mar 2, 2021
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

3 participants