mirror of
https://github.com/rancher/rke.git
synced 2025-09-12 21:24:00 +00:00
vendor update k8s 1.17 default
This commit is contained in:
2
go.mod
2
go.mod
@@ -47,7 +47,7 @@ require (
|
|||||||
github.com/mattn/go-colorable v0.1.0
|
github.com/mattn/go-colorable v0.1.0
|
||||||
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
|
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
|
||||||
github.com/pkg/errors v0.8.1
|
github.com/pkg/errors v0.8.1
|
||||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191228023913-151570da604f
|
github.com/rancher/kontainer-driver-metadata v0.0.0-20200102184830-62373fc95553
|
||||||
github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
||||||
github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
|
github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
|
||||||
github.com/sirupsen/logrus v1.4.2
|
github.com/sirupsen/logrus v1.4.2
|
||||||
|
4
go.sum
4
go.sum
@@ -517,8 +517,8 @@ github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYL
|
|||||||
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
||||||
github.com/rancher/client-go v1.16.0-rancher.3 h1:bOA0zwtJi8wUeldqfrCGyDRuN6oW+zJ092i/OhWP2nU=
|
github.com/rancher/client-go v1.16.0-rancher.3 h1:bOA0zwtJi8wUeldqfrCGyDRuN6oW+zJ092i/OhWP2nU=
|
||||||
github.com/rancher/client-go v1.16.0-rancher.3/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
|
github.com/rancher/client-go v1.16.0-rancher.3/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
|
||||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191228023913-151570da604f h1:qmrQHAovyGXAxVqyU5XMcZC0/WMJCdJtReOfgOAQQo0=
|
github.com/rancher/kontainer-driver-metadata v0.0.0-20200102184830-62373fc95553 h1:OWZm4Eksj8JIoV3MDJAyIFlUt37mn7oKiVFz7Lt9vsw=
|
||||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191228023913-151570da604f/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
|
github.com/rancher/kontainer-driver-metadata v0.0.0-20200102184830-62373fc95553/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
|
||||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
|
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
|
||||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
|
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
|
||||||
github.com/rancher/norman v0.0.0-20191126010027-3afadb987c81 h1:40IyRSjbSj/jNHpJFOHGOlUvOCIQKUMF6p8Tcc/w1vs=
|
github.com/rancher/norman v0.0.0-20191126010027-3afadb987c81 h1:40IyRSjbSj/jNHpJFOHGOlUvOCIQKUMF6p8Tcc/w1vs=
|
||||||
|
7
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
7
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
@@ -11,9 +11,10 @@ func loadRancherDefaultK8sVersions() map[string]string {
|
|||||||
"2.3.0": "v1.15.x",
|
"2.3.0": "v1.15.x",
|
||||||
"2.3.1": "v1.15.x",
|
"2.3.1": "v1.15.x",
|
||||||
"2.3.2": "v1.15.x",
|
"2.3.2": "v1.15.x",
|
||||||
"2.3": "v1.16.x",
|
"2.3.3": "v1.16.x",
|
||||||
|
"2.3": "v1.17.x",
|
||||||
// rancher will use default if its version is absent
|
// rancher will use default if its version is absent
|
||||||
"default": "v1.16.x",
|
"default": "v1.17.x",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,7 +22,7 @@ func loadRKEDefaultK8sVersions() map[string]string {
|
|||||||
return map[string]string{
|
return map[string]string{
|
||||||
"0.3": "v1.16.3-rancher1-1",
|
"0.3": "v1.16.3-rancher1-1",
|
||||||
// rke will use default if its version is absent
|
// rke will use default if its version is absent
|
||||||
"default": "v1.16.4-rancher1-1",
|
"default": "v1.17.0-rancher1-2",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@@ -129,7 +129,7 @@ github.com/prometheus/procfs
|
|||||||
github.com/prometheus/procfs/internal/util
|
github.com/prometheus/procfs/internal/util
|
||||||
github.com/prometheus/procfs/nfs
|
github.com/prometheus/procfs/nfs
|
||||||
github.com/prometheus/procfs/xfs
|
github.com/prometheus/procfs/xfs
|
||||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20191228023913-151570da604f
|
# github.com/rancher/kontainer-driver-metadata v0.0.0-20200102184830-62373fc95553
|
||||||
github.com/rancher/kontainer-driver-metadata/rke
|
github.com/rancher/kontainer-driver-metadata/rke
|
||||||
github.com/rancher/kontainer-driver-metadata/rke/templates
|
github.com/rancher/kontainer-driver-metadata/rke/templates
|
||||||
# github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
# github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
||||||
|
Reference in New Issue
Block a user