Skip to content

Conversation

@TBBle
Copy link
Contributor

@TBBle TBBle commented Feb 12, 2021

containerd has an extensive dependency tree, and this is a large jump from v1.3.2, so this single-line change leads to a lot of churn in both go.mod and vendoring, particularly for the 'test' submodule.

Switching from v1.3.2 to v1.5.0-beta1 is too large a comparison for GitHub to usefully show, particularly because it goes down the release-1.3 branch back to September 2019, and then forwards to near current master.

This change is being done to get containerd/containerd#4395, which deforked some code from Microsoft/go-winio. A structure type used by that deduplicated has changed in go-winio recently, and so pulling in both older containerd and newer go-winio leads to compile failures.

The motivation for this change is that #901 requires newer go-winio; the same PR as the API change; as it happens.

containerd has an extensive dependency tree, and this is a large jump
from v1.3.2, so this single-line change leads to a lot of churn in both
go.mod and vendoring, particularly for the 'test' submodule.

Signed-off-by: Paul "TBBle" Hampson <[email protected]>
@TBBle TBBle requested a review from a team as a code owner February 12, 2021 10:40
@TBBle
Copy link
Contributor Author

TBBle commented Feb 12, 2021

For reference, the compile failure log is

# github.com/containerd/containerd/archive
c:\gopath\pkg\mod\github.com\containerd\[email protected]\archive\tar_windows.go:234:3: cannot use syscall.NsecToFiletime(hdr.AccessTime.UnixNano()) (type syscall.Filetime) as type "golang.org/x/sys/windows".Filetime in field value
c:\gopath\pkg\mod\github.com\containerd\[email protected]\archive\tar_windows.go:235:3: cannot use syscall.NsecToFiletime(hdr.ModTime.UnixNano()) (type syscall.Filetime) as type "golang.org/x/sys/windows".Filetime in field value
c:\gopath\pkg\mod\github.com\containerd\[email protected]\archive\tar_windows.go:236:3: cannot use syscall.NsecToFiletime(hdr.ChangeTime.UnixNano()) (type syscall.Filetime) as type "golang.org/x/sys/windows".Filetime in field value
c:\gopath\pkg\mod\github.com\containerd\[email protected]\archive\tar_windows.go:239:3: cannot use syscall.NsecToFiletime(hdr.ModTime.UnixNano()) (type syscall.Filetime) as type "golang.org/x/sys/windows".Filetime in field value
c:\gopath\pkg\mod\github.com\containerd\[email protected]\archive\tar_windows.go:257:25: cannot use syscall.NsecToFiletime(createTime.UnixNano()) (type syscall.Filetime) as type "golang.org/x/sys/windows".Filetime in assignment

Copy link

@katiewasnothere katiewasnothere left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for doing this :)

@katiewasnothere katiewasnothere merged commit 1287a2c into microsoft:master Feb 16, 2021
@TBBle TBBle deleted the update-containerd-to-v1.5.0-beta1 branch February 17, 2021 00:33
@TBBle
Copy link
Contributor Author

TBBle commented Mar 1, 2021

For the record, containerd 1.5.0-beta2 has been released, but nothing leapt out from the diff that is worth worrying about here. A fork of hcsshim.CreateSandboxLayer has appeared though, oddly enough, using vmcompute.

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.

2 participants