1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-09 19:09:51 +00:00

Vendor changes

This commit is contained in:
Brenda Rearden
2020-01-03 09:58:53 -07:00
parent e6d8bcccc8
commit e96704e1e6
4 changed files with 8 additions and 4 deletions

2
go.mod
View File

@@ -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-20200102184830-62373fc95553 github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322
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
View File

@@ -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-20200102184830-62373fc95553 h1:OWZm4Eksj8JIoV3MDJAyIFlUt37mn7oKiVFz7Lt9vsw= github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322 h1:kcpxOKgMsp7+a6alMhIZTuoHqfSyUCjdsLiheJbg5Bw=
github.com/rancher/kontainer-driver-metadata v0.0.0-20200102184830-62373fc95553/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I= github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322/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=

View File

@@ -5,6 +5,10 @@ import v3 "github.com/rancher/types/apis/management.cattle.io/v3"
func loadK8sVersionWindowsServiceOptions() map[string]v3.KubernetesServicesOptions { func loadK8sVersionWindowsServiceOptions() map[string]v3.KubernetesServicesOptions {
// since 1.14, windows has been supported // since 1.14, windows has been supported
return map[string]v3.KubernetesServicesOptions{ return map[string]v3.KubernetesServicesOptions{
"v1.17": {
Kubelet: getWindowsKubeletOptions116(),
Kubeproxy: getWindowsKubeProxyOptions(),
},
"v1.16": { "v1.16": {
Kubelet: getWindowsKubeletOptions116(), Kubelet: getWindowsKubeletOptions116(),
Kubeproxy: getWindowsKubeProxyOptions(), Kubeproxy: getWindowsKubeProxyOptions(),

2
vendor/modules.txt vendored
View File

@@ -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-20200102184830-62373fc95553 # github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322
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