Unverified Commit db5e5d35 authored by Manuel Buil's avatar Manuel Buil Committed by GitHub

Merge pull request #5035 from manuelbuil/update_versions

Update versions of K3S root, flannel and cni_plugins
parents 6fe36be6 3fffef18
......@@ -63,7 +63,7 @@ replace (
)
require (
github.com/Microsoft/hcsshim v0.8.23
github.com/Microsoft/hcsshim v0.9.2
github.com/containerd/cgroups v1.0.1
github.com/containerd/containerd v1.6.0-beta.2.0.20211117185425-a776a27af54a
github.com/containerd/fuse-overlayfs-snapshotter v1.0.4
......@@ -72,7 +72,7 @@ require (
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/docker/docker v20.10.10+incompatible
github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83
github.com/flannel-io/flannel v0.15.1
github.com/flannel-io/flannel v0.16.3
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/golangplus/testing v1.0.0 // indirect
......@@ -111,9 +111,9 @@ require (
go.etcd.io/etcd/client/v3 v3.5.1
go.etcd.io/etcd/etcdutl/v3 v3.5.1
go.etcd.io/etcd/server/v3 v3.5.1
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
golang.org/x/net v0.0.0-20211209124913-491a49abca63
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
google.golang.org/grpc v1.42.0
gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
......
......@@ -42,9 +42,9 @@ if [ -z "$VERSION_RUNC" ]; then
VERSION_RUNC="v0.0.0"
fi
VERSION_CNIPLUGINS="v0.9.1-k3s1"
VERSION_CNIPLUGINS="v1.0.1-k3s1"
VERSION_ROOT="v0.9.1"
VERSION_ROOT="v0.11.0"
if [[ -n "$GIT_TAG" ]]; then
if [[ ! "$GIT_TAG" =~ ^"$VERSION_K8S"[+-] ]]; then
......
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