Commit 3ed243df authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Bump containerd to v1.5.16-k3s1-1-22

parent 3d82902b
...@@ -9,7 +9,7 @@ replace ( ...@@ -9,7 +9,7 @@ replace (
github.com/containerd/btrfs => github.com/containerd/btrfs v1.0.0 github.com/containerd/btrfs => github.com/containerd/btrfs v1.0.0
github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1 github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1
github.com/containerd/console => github.com/containerd/console v1.0.2 github.com/containerd/console => github.com/containerd/console v1.0.2
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.13-k3s1 // k3s-release/1.5 github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.16-k3s1-1-22
github.com/containerd/continuity => github.com/containerd/continuity v0.3.0 github.com/containerd/continuity => github.com/containerd/continuity v0.3.0
github.com/containerd/fifo => github.com/containerd/fifo v1.0.0 github.com/containerd/fifo => github.com/containerd/fifo v1.0.0
github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0 github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0
...@@ -24,6 +24,7 @@ replace ( ...@@ -24,6 +24,7 @@ replace (
github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5
github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f
github.com/klauspost/compress => github.com/klauspost/compress v1.15.9
github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.21.0-k3s1 github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.21.0-k3s1
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
// LOOK TO scripts/version.sh FOR THE VERSION OF runc THAT WE ARE BUILDING/SHIPPING // LOOK TO scripts/version.sh FOR THE VERSION OF runc THAT WE ARE BUILDING/SHIPPING
...@@ -80,12 +81,12 @@ replace ( ...@@ -80,12 +81,12 @@ replace (
) )
require ( require (
github.com/Microsoft/hcsshim v0.9.2 github.com/Microsoft/hcsshim v0.9.4
github.com/cloudnativelabs/kube-router v1.3.2 github.com/cloudnativelabs/kube-router v1.3.2
github.com/containerd/cgroups v1.0.3 github.com/containerd/cgroups v1.0.3
github.com/containerd/containerd v1.6.2 github.com/containerd/containerd v1.6.9
github.com/containerd/fuse-overlayfs-snapshotter v1.0.4 github.com/containerd/fuse-overlayfs-snapshotter v1.0.5
github.com/containerd/stargz-snapshotter v0.11.4 github.com/containerd/stargz-snapshotter v0.13.0
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
...@@ -99,16 +100,16 @@ require ( ...@@ -99,16 +100,16 @@ require (
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/k3s-io/helm-controller v0.12.3 github.com/k3s-io/helm-controller v0.12.3
github.com/k3s-io/kine v0.9.3 github.com/k3s-io/kine v0.9.3
github.com/klauspost/compress v1.15.9 github.com/klauspost/compress v1.15.12
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
github.com/minio/minio-go/v7 v7.0.33 github.com/minio/minio-go/v7 v7.0.33
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.3
github.com/onsi/gomega v1.17.0 github.com/onsi/gomega v1.17.0
github.com/opencontainers/runc v1.1.0 github.com/opencontainers/runc v1.1.2
github.com/opencontainers/selinux v1.10.0 github.com/opencontainers/selinux v1.10.2
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.4-0.20220721210816-8ebd77f8a45a github.com/rancher/dynamiclistener v0.3.4-0.20220721210816-8ebd77f8a45a
...@@ -120,7 +121,7 @@ require ( ...@@ -120,7 +121,7 @@ require (
github.com/rootless-containers/rootlesskit v1.0.1 github.com/rootless-containers/rootlesskit v1.0.1
github.com/sirupsen/logrus v1.9.0 github.com/sirupsen/logrus v1.9.0
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.1 github.com/stretchr/testify v1.8.0
github.com/urfave/cli v1.22.9 github.com/urfave/cli v1.22.9
github.com/vishvananda/netlink v1.2.1-beta.2 github.com/vishvananda/netlink v1.2.1-beta.2
github.com/yl2chen/cidranger v1.0.2 github.com/yl2chen/cidranger v1.0.2
...@@ -132,22 +133,22 @@ require ( ...@@ -132,22 +133,22 @@ require (
go.uber.org/zap v1.19.0 go.uber.org/zap v1.19.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/net v0.0.0-20220722155237-a158d28d115b golang.org/x/net v0.0.0-20220722155237-a158d28d115b
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f golang.org/x/sys v0.2.0
google.golang.org/grpc v1.45.0 google.golang.org/grpc v1.50.1
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.25.4
k8s.io/apimachinery v0.23.5 k8s.io/apimachinery v0.25.4
k8s.io/apiserver v0.22.17 k8s.io/apiserver v0.22.17
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cloud-provider v0.22.17 k8s.io/cloud-provider v0.22.17
k8s.io/component-base v0.22.17 k8s.io/component-base v0.22.17
k8s.io/cri-api v0.24.0-beta.0 k8s.io/cri-api v0.26.0-alpha.3
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kubectl v0.22.17 k8s.io/kubectl v0.22.17
k8s.io/kubernetes v1.22.17 k8s.io/kubernetes v1.22.17
k8s.io/utils v0.0.0-20211116205334-6203023598ed k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
......
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