Thanks! I see there's a failure in the vendor check; https://ci.docker.com/public/job/moby/job/PR-40032/1/execution/node/260/log/

00:21:10.129  The result of vndr differs
00:21:10.129  
00:21:10.129   D vendor/golang.org/x/sync/singleflight/singleflight.go
00:21:10.129  
00:21:10.129  Please vendor your package with github.com/LK4D4/vndr.

Interestingly, I just saw the same failure in #39713 (#39713 (comment)), which also updates the containerd dependency

@jmartin84 Curious; were the buildkit and containerd bumps necessary to fix the issue? I haven't looked in-depth into the changes, but if they're not, perhaps it would be better to keep that change out.

If they are necessary, I think we should wait with merging this one, until after #39713 is merged (then rebase this PR to get rid of the containerd and buildkit bumps)

ok, this is weird; I just tried running vndr golang.org/x/sync on this branch, and it did not produce a diff;

On branch fix-grpc-withdialer-deprecation-warning
nothing to commit, working tree clean

Also double checked if the base image hasn't been updated on Docker Hub (which doesn't seem to be the case); https://hub.docker.com/_/golang?tab=tags&page=1&name=stretch

@thaJeztah unfortunately the containerd bump was necessary dialer.ContextDialer wasn't available in the version of containerd that is currently in master. Buildkit wasn't directly required but I did get some errors after bumping containerd that resolved once I brought in buildkit.

I'm more than happy to wait for the other pr to get merged.

unfortunately the containerd bump was necessary dialer.ContextDialer wasn't available in the version of containerd that is currently in master. Buildkit wasn't directly required but I did get some errors after bumping containerd that resolved once I brought in buildkit.

Thanks for explaining!

OK, looks like the vendor failure is a problem on master; the reason it worked for me locally, was that I did not do a rebase of your PR, unlike Jenkins, which does a merge before running, which likely explains the different.

I opened a PR to fix the vendoring #40037

@thaJeztah looks like the dependent prs got merged so I went ahead and rebased.

ping @kolyshkin @cpuguy83 PTAL