go.mod: bump CRI replacement version and match vendor changes in upst…

…ream 1.4.8 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io · Jul 20, 2021 · ed851ec · ed851ec
1 parent e1fa6be
commit ed851ec
Show file tree

Hide file tree

Showing 2 changed files with 277 additions and 147 deletions.
diff --git a/go.mod b/go.mod
@@ -4,82 +4,78 @@ go 1.14
 
 replace (
 	github.com/containerd/continuity => github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1
-	github.com/containerd/cri => github.com/k3s-io/cri v1.4.0-k3s.6 // k3s-release/1.4
+	github.com/containerd/cri => github.com/k3s-io/cri v1.4.0-k3s.7 // k3s-release/1.4
 	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
 	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
-	k8s.io/api => k8s.io/api v0.19.5
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.5
-	k8s.io/apiserver => k8s.io/apiserver v0.19.5
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.5
-	k8s.io/client-go => k8s.io/client-go v0.19.5
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.5
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.5
-	k8s.io/code-generator => k8s.io/code-generator v0.19.5
-	k8s.io/component-base => k8s.io/component-base v0.19.5
-	k8s.io/cri-api => k8s.io/cri-api v0.19.5
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.5
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.5
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.5
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.5
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.5
-	k8s.io/kubectl => k8s.io/kubectl v0.19.5
-	k8s.io/kubelet => k8s.io/kubelet v0.19.5
+	k8s.io/api => k8s.io/api v0.19.10
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.10
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.10
+	k8s.io/apiserver => k8s.io/apiserver v0.19.10
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.10
+	k8s.io/client-go => k8s.io/client-go v0.19.10
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.10
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.10
+	k8s.io/code-generator => k8s.io/code-generator v0.19.10
+	k8s.io/component-base => k8s.io/component-base v0.19.10
+	k8s.io/cri-api => k8s.io/cri-api v0.19.10
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.10
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.10
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.10
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.10
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.10
+	k8s.io/kubectl => k8s.io/kubectl v0.19.10
+	k8s.io/kubelet => k8s.io/kubelet v0.19.10
 	k8s.io/kubernetes => k8s.io/kubernetes v1.19.5
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.5
-	k8s.io/metrics => k8s.io/metrics v0.19.5
-	k8s.io/node-api => k8s.io/node-api v0.19.5
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.5
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.5
-	k8s.io/sample-controller => k8s.io/sample-controller v0.19.5
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.10
+	k8s.io/metrics => k8s.io/metrics v0.19.10
+	k8s.io/node-api => k8s.io/node-api v0.19.10
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.10
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.10
+	k8s.io/sample-controller => k8s.io/sample-controller v0.19.10
 )
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
-	github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990
-	github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0
-	github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c
-	github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e
-	github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340
-	github.com/containerd/console v1.0.0
-	github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
+	github.com/Microsoft/go-winio v0.4.19
+	github.com/Microsoft/hcsshim v0.8.20
+	github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3
+	github.com/containerd/aufs v1.0.0
+	github.com/containerd/btrfs v1.0.0
+	github.com/containerd/cgroups v1.0.1
+	github.com/containerd/console v1.0.2
+	github.com/containerd/continuity v0.1.0
 	github.com/containerd/cri v1.11.1-0.20200810101850-4e6644c8cf7f
-	github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b
-	github.com/containerd/go-cni v1.0.1 // indirect
-	github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
-	github.com/containerd/imgcrypt v1.0.1 // indirect
-	github.com/containerd/ttrpc v1.0.1
-	github.com/containerd/typeurl v1.0.1
-	github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff
-	github.com/containernetworking/plugins v0.8.6 // indirect
+	github.com/containerd/fifo v1.0.0
+	github.com/containerd/go-runc v1.0.0
+	github.com/containerd/ttrpc v1.0.2
+	github.com/containerd/typeurl v1.0.2
+	github.com/containerd/zfs v1.0.0
 	github.com/coreos/go-systemd/v22 v22.1.0
 	github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
 	github.com/docker/go-metrics v0.0.1
 	github.com/docker/go-units v0.4.0
-	github.com/gogo/googleapis v1.3.2
-	github.com/gogo/protobuf v1.3.1
-	github.com/google/go-cmp v0.4.0
-	github.com/google/uuid v1.1.1
+	github.com/gogo/googleapis v1.4.0
+	github.com/gogo/protobuf v1.3.2
+	github.com/google/go-cmp v0.5.4
+	github.com/google/uuid v1.2.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/go-multierror v1.0.0
-	github.com/imdario/mergo v0.3.8
+	github.com/imdario/mergo v0.3.11
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.1
-	github.com/opencontainers/runc v1.0.0-rc92
-	github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
-	github.com/opencontainers/selinux v1.6.0
+	github.com/opencontainers/runc v1.0.0-rc93
+	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
+	github.com/opencontainers/selinux v1.8.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.7.1
 	github.com/sirupsen/logrus v1.7.0
-	github.com/stretchr/testify v1.4.0
-	github.com/tchap/go-patricia v2.2.6+incompatible // indirect
+	github.com/stretchr/testify v1.6.1
 	github.com/urfave/cli v1.22.2
 	go.etcd.io/bbolt v1.3.5
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3
-	google.golang.org/grpc v1.27.1
-	gotest.tools/v3 v3.0.2
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
+	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
+	gotest.tools/v3 v3.0.3
 )