Merge pull request #1015 from dims/updated-to-containerd-v1.5.0

Updated to containerd v1.5.0
microsoft · May 4, 2021 · f105e07 · f105e07
2 parents e481a13 + 6212521
commit f105e07
Show file tree

Hide file tree

Showing 356 changed files with 7,153 additions and 6,009 deletions.
diff --git a/go.mod b/go.mod
@@ -3,13 +3,13 @@ module github.com/Microsoft/hcsshim
 go 1.13
 
 require (
-	github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3
-	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
-	github.com/containerd/console v1.0.1
-	github.com/containerd/containerd v1.5.0-beta.4
-	github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
+	github.com/Microsoft/go-winio v0.4.17
+	github.com/containerd/cgroups v1.0.1
+	github.com/containerd/console v1.0.2
+	github.com/containerd/containerd v1.5.0
+	github.com/containerd/go-runc v1.0.0
 	github.com/containerd/ttrpc v1.0.2
-	github.com/containerd/typeurl v1.0.1
+	github.com/containerd/typeurl v1.0.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
diff --git a/test/functional/wcow_test.go b/test/functional/wcow_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/Microsoft/hcsshim/internal/hcsoci"
 	layerspkg "github.com/Microsoft/hcsshim/internal/layers"
 	"github.com/Microsoft/hcsshim/internal/resources"
-	"github.com/Microsoft/hcsshim/internal/schema1"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema1"
 	"github.com/Microsoft/hcsshim/internal/schemaversion"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	"github.com/Microsoft/hcsshim/internal/uvmfolder"

diff --git a/test/go.mod b/test/go.mod
@@ -3,12 +3,12 @@ module github.com/Microsoft/hcsshim/test
 go 1.16
 
 require (
-	github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3
-	github.com/Microsoft/hcsshim v0.8.15
-	github.com/containerd/containerd v1.5.0-beta.4
-	github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
+	github.com/Microsoft/go-winio v0.4.17
+	github.com/Microsoft/hcsshim v0.8.16
+	github.com/containerd/containerd v1.5.0
+	github.com/containerd/go-runc v1.0.0
 	github.com/containerd/ttrpc v1.0.2
-	github.com/containerd/typeurl v1.0.1
+	github.com/containerd/typeurl v1.0.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
 	github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39
@@ -17,7 +17,7 @@ require (
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	golang.org/x/sys v0.0.0-20210324051608-47abb6519492
 	google.golang.org/grpc v1.33.2
-	k8s.io/cri-api v0.20.1
+	k8s.io/cri-api v0.20.6
 )
 
 replace (

diff --git a/test/go.sum b/test/go.sum
diff --git a/test/internal/schemaversion_test.go b/test/internal/schemaversion_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/Microsoft/hcsshim/internal/schema2"
+	"github.com/Microsoft/hcsshim/internal/hcs/schema2"
 	"github.com/Microsoft/hcsshim/internal/schemaversion"
 	"github.com/Microsoft/hcsshim/osversion"
 	_ "github.com/Microsoft/hcsshim/test/functional/manifest"

diff --git a/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml b/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml
diff --git a/test/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go b/test/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/computestorage/storage.go b/test/vendor/github.com/Microsoft/hcsshim/computestorage/storage.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/container.go b/test/vendor/github.com/Microsoft/hcsshim/container.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/go.mod b/test/vendor/github.com/Microsoft/hcsshim/go.mod