Merge pull request #135 from dhiltgen/bump_vendoring_2

Bump vendoring for containerd and runc

go.mod

@@ -4,14 +4,13 @@ go 1.14
 
 require (
 	github.com/containerd/console v1.0.3
-	github.com/containerd/containerd v1.5.11
+	github.com/containerd/containerd v1.6.6
 	github.com/docker/distribution v2.8.0+incompatible
 	github.com/docker/docker v20.10.12+incompatible
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/moby/buildkit v0.9.3
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.0.2
-	github.com/opencontainers/runc v1.0.3 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
 	github.com/pkg/errors v0.9.1
 	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
 	github.com/sirupsen/logrus v1.8.1
@@ -20,7 +19,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	google.golang.org/grpc v1.39.0
+	google.golang.org/grpc v1.43.0
 	k8s.io/api v0.23.5
 	k8s.io/apimachinery v0.23.5
 	k8s.io/cli-runtime v0.23.5
@@ -29,4 +28,4 @@ require (
 
 replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
 
-replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
+replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2

pkg/build/build.go

@@ -23,6 +23,7 @@ import (
 	"github.com/vmware-tanzu/buildkit-cli-for-kubectl/pkg/imagetools"
 	"github.com/vmware-tanzu/buildkit-cli-for-kubectl/pkg/progress"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/docker/distribution/reference"
@@ -1053,7 +1054,7 @@ func newContainerdLoader(ctx context.Context, d driver.Driver, kubeClientConfig
 	started := make([]chan struct{}, len(nodeNames))
 	for i := range nodeNames {
 		nodeName := nodeNames[i]
-		c, err := containerd.New(nodeName,
+		c, err := containerd.New("/run/containerd/containerd.sock",
 
 			// TODO - plumb the containerd namespace through so this isn't hard-coded
 			containerd.WithDefaultNamespace("k8s.io"),
@@ -1067,11 +1068,11 @@ func newContainerdLoader(ctx context.Context, d driver.Driver, kubeClientConfig
 						return conn, nil
 					},
 				),
-				grpc.WithInsecure(), // Nested connection on an existing secure transport
+				grpc.WithTransportCredentials(insecure.NewCredentials()), //  Nested connection on an existing secure transport
 			}),
 		)
 		if err != nil {
-			return nil, nil, fmt.Errorf("failed to set up docker client via proxy: %w", err)
+			return nil, nil, fmt.Errorf("failed to set up containerd client via proxy: %w", err)
 		}
 
 		pr, pw := io.Pipe()