Commit f4336186 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Bump containerd to v1.5.11-k3s1

parent 809f0cf0
...@@ -6,7 +6,8 @@ replace ( ...@@ -6,7 +6,8 @@ replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22 github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.22
github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7
github.com/cloudnativelabs/kube-router => github.com/k3s-io/kube-router v1.3.3-0.20220405142336-8ea9a06dc0e3 github.com/cloudnativelabs/kube-router => github.com/k3s-io/kube-router v1.3.3-0.20220405142336-8ea9a06dc0e3
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.10-k3s1 // k3s-release/1.5 github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.11-k3s1 // k3s-release/1.5
github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker => github.com/docker/docker v20.10.7+incompatible github.com/docker/docker => github.com/docker/docker v20.10.7+incompatible
...@@ -66,10 +67,10 @@ replace ( ...@@ -66,10 +67,10 @@ replace (
require ( require (
github.com/Microsoft/hcsshim v0.9.2 github.com/Microsoft/hcsshim v0.9.2
github.com/cloudnativelabs/kube-router v1.3.2 github.com/cloudnativelabs/kube-router v1.3.2
github.com/containerd/cgroups v1.0.1 github.com/containerd/cgroups v1.0.3
github.com/containerd/containerd v1.6.0-rc.1 github.com/containerd/containerd v1.6.1
github.com/containerd/fuse-overlayfs-snapshotter v1.0.4 github.com/containerd/fuse-overlayfs-snapshotter v1.0.4
github.com/containerd/stargz-snapshotter v0.11.0 github.com/containerd/stargz-snapshotter v0.11.3
github.com/coreos/go-iptables v0.6.0 github.com/coreos/go-iptables v0.6.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/docker/docker v20.10.10+incompatible github.com/docker/docker v20.10.10+incompatible
...@@ -85,7 +86,7 @@ require ( ...@@ -85,7 +86,7 @@ require (
github.com/gruntwork-io/terratest v0.40.6 github.com/gruntwork-io/terratest v0.40.6
github.com/k3s-io/helm-controller v0.12.1 github.com/k3s-io/helm-controller v0.12.1
github.com/k3s-io/kine v0.8.1 github.com/k3s-io/kine v0.8.1
github.com/klauspost/compress v1.14.2 github.com/klauspost/compress v1.15.1
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.10.2 github.com/lib/pq v1.10.2
github.com/mattn/go-sqlite3 v1.14.8 github.com/mattn/go-sqlite3 v1.14.8
...@@ -93,8 +94,8 @@ require ( ...@@ -93,8 +94,8 @@ require (
github.com/natefinch/lumberjack v2.0.0+incompatible github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/onsi/ginkgo/v2 v2.1.1 github.com/onsi/ginkgo/v2 v2.1.1
github.com/onsi/gomega v1.17.0 github.com/onsi/gomega v1.17.0
github.com/opencontainers/runc v1.0.3 github.com/opencontainers/runc v1.1.0
github.com/opencontainers/selinux v1.8.3 github.com/opencontainers/selinux v1.10.0
github.com/otiai10/copy v1.7.0 github.com/otiai10/copy v1.7.0
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rancher/dynamiclistener v0.3.1 github.com/rancher/dynamiclistener v0.3.1
...@@ -108,15 +109,15 @@ require ( ...@@ -108,15 +109,15 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
github.com/tchap/go-patricia v2.3.0+incompatible // indirect github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/urfave/cli v1.22.4 github.com/urfave/cli v1.22.4
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
go.etcd.io/etcd/api/v3 v3.5.1 go.etcd.io/etcd/api/v3 v3.5.1
go.etcd.io/etcd/client/v3 v3.5.1 go.etcd.io/etcd/client/v3 v3.5.1
go.etcd.io/etcd/etcdutl/v3 v3.5.1 go.etcd.io/etcd/etcdutl/v3 v3.5.1
go.etcd.io/etcd/server/v3 v3.5.1 go.etcd.io/etcd/server/v3 v3.5.1
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
golang.org/x/net v0.0.0-20211209124913-491a49abca63 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
google.golang.org/grpc v1.44.0 google.golang.org/grpc v1.45.0
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
k8s.io/api v0.23.5 k8s.io/api v0.23.5
...@@ -127,7 +128,7 @@ require ( ...@@ -127,7 +128,7 @@ require (
k8s.io/component-base v0.23.5 k8s.io/component-base v0.23.5
k8s.io/component-helpers v0.0.0 k8s.io/component-helpers v0.0.0
k8s.io/controller-manager v0.23.5 // indirect k8s.io/controller-manager v0.23.5 // indirect
k8s.io/cri-api v0.24.0-alpha.1 k8s.io/cri-api v0.24.0-alpha.3
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kubectl v0.23.5 k8s.io/kubectl v0.23.5
k8s.io/kubernetes v1.23.5 k8s.io/kubernetes v1.23.5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment