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.

Sign up for GitHub

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

Jump to bottom

go.mod: update various dependencies #941

Closed
wants to merge 7 commits into from
Closed

go.mod: update various dependencies #941

wants to merge 7 commits into from

Conversation

thaJeztah
Copy link
Contributor

See individual commits for details

@thaJeztah
go mod tidy
c5d20fb 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: sirupsen/logrus v1.7.0
c7cd10a 
full diff: sirupsen/logrus@v1.4.2...v1.7.0

logrus v1.7.0 removes dependency on github.com/konsorten/go-windows-terminal-sequences

Features:

* a new buffer pool management API has been added
* a set of `<LogLevel>Fn()` functions have been added

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/containerd/ttrpc v1.0.2
bc9e735 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/Microsoft/go-winio v0.4.16
969f367 
The go.mod specified the commit instead of the tag

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/containerd/typeurl v1.0.1
ebf74b3 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/containerd/console v1.0.1
7b4f97a 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: update github.com/containerd/containerd v1.4.3
032fc32 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah requested a review from a team as a code owner February 8, 2021 14:19
@thaJeztah
Copy link
Contributor Author

Hmmm... something's failing;

ok  	github.com/Microsoft/hcsshim/test/internal	0.058s
648go test -gcflags=all=-d=checkptr -c ./containerd-shim-runhcs-v1/ -tags functional
649go: downloading github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39
650go: downloading github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8
651go: downloading github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f
652go: downloading github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874
653go: downloading github.com/blang/semver v3.1.0+incompatible
654go: downloading github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce
655go: downloading github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
656go: downloading github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
657go test -gcflags=all=-d=checkptr -c ./cri-containerd/ -tags functional
658go: downloading k8s.io/cri-api v0.17.3
659go: downloading github.com/opencontainers/image-spec v1.0.0
660go: finding module for package github.com/opencontainers/selinux/go-selinux/label
661go: finding module for package github.com/opencontainers/runc/libcontainer/user
662go: downloading golang.org/x/net v0.0.0-20200707034311-ab3426394381
663go: downloading github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
664go: downloading github.com/gogo/googleapis v1.2.0
665go: downloading github.com/opencontainers/runc v0.1.1
666go: downloading github.com/opencontainers/selinux v1.8.0
667go: finding module for package github.com/google/uuid
668go: downloading github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
669go: downloading github.com/google/uuid v1.2.0
670go: downloading golang.org/x/text v0.3.2
671go: found github.com/opencontainers/selinux/go-selinux/label in github.com/opencontainers/selinux v1.8.0
672go: found github.com/opencontainers/runc/libcontainer/user in github.com/opencontainers/runc v0.1.1
673go: found github.com/google/uuid in github.com/google/uuid v1.2.0
674# github.com/containerd/containerd/api/services/introspection/v1
675c:\gopath\pkg\mod\github.com\containerd\[email protected]\api\services\introspection\v1\introspection.pb.go:440:26: m.InitErr.MarshalToSizedBuffer undefined (type *rpc.Status has no field or method MarshalToSizedBuffer)
676Command exited with code 2

Wondering if this is because of the override in the test sub-module to use ../ 🤔

@dcantah
Copy link
Contributor

dcantah commented Feb 8, 2021

@thaJeztah I assume this: #942 is to fix the CI issue you're mentioning?

@thaJeztah
Copy link
Contributor Author

@dcantah I'm not sure it fixes the issue, but at least looked like something that wasn't correct currently.

I was planning to update both modules separately (the "test" module is a separate module, so I didn't want to modify both in the same PR), but when trying to update the hcsshim "main module" dependency there, I ran into issues because the go-winio dependency has some windows-only packages, and apparently go mod doesn't deal with that when not on Windows 😣

@thaJeztah thaJeztah mentioned this pull request Feb 9, 2021
Closed
@thaJeztah
Copy link
Contributor Author

I opened microsoft/go-winio#193 to (hopefully) fix the go modules problem I described.

@TBBle TBBle mentioned this pull request Feb 11, 2021
Closed
@katiewasnothere
Copy link
Contributor

Looks like between containerd v1.3.2 and v1.4.x there was a change that added code to use MarshalToSizedBuffer on googleapi's rpc proto struct, which doesn't exist. I'm not sure why this change was made.

@thaJeztah
Copy link
Contributor Author

Obsoleted by #946, which also updated these dependencies

@thaJeztah thaJeztah closed this Mar 2, 2021
@thaJeztah thaJeztah deleted the bump_deps branch March 2, 2021 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @dcantah @katiewasnothere