rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-09 11:01:40 +00:00
Code Issues Releases Wiki Activity

Vendor changes

Browse Source
This commit is contained in:
Brenda Rearden
2019-12-23 14:10:23 -07:00
parent 078f11b8a6
commit 65471892fa
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -47,9 +47,9 @@ 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-20191221002039-8e3994417ca3 github.com/rancher/kontainer-driver-metadata v0.0.0-20191223200943-7b4e4888b0c8
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-20191217214229-b0c77ca09648 github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus v1.4.2
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0

8
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-20191221002039-8e3994417ca3 h1:sWSTmG+4hQB12QRTtNTj4FP8zcvswvtmRYlkpNr7wKs= github.com/rancher/kontainer-driver-metadata v0.0.0-20191223200943-7b4e4888b0c8 h1:6D/eblFc5ARqAoi69ikvHKx55ZHBJhTVnqOUKreh2d0=
github.com/rancher/kontainer-driver-metadata v0.0.0-20191221002039-8e3994417ca3/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I= github.com/rancher/kontainer-driver-metadata v0.0.0-20191223200943-7b4e4888b0c8/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=
@@ -528,8 +528,8 @@ github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222/go.mod h1:kVWc1OyHK
github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e h1:j6+HqCET/NLPBtew2m5apL7jWw/PStQ7iGwXjgAqdvo= github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e h1:j6+HqCET/NLPBtew2m5apL7jWw/PStQ7iGwXjgAqdvo=
github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e/go.mod h1:XbYHTPaXuw8ZY9bylhYKQh/nJxDaTKk3YhAxPl4Qy/k= github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e/go.mod h1:XbYHTPaXuw8ZY9bylhYKQh/nJxDaTKk3YhAxPl4Qy/k=
github.com/rancher/types v0.0.0-20191115181915-fa1ec441252a/go.mod h1:K5zlxVpe7bY2QgOs1YUcU8dVXtzKncxpGEcvxGMgr0k= github.com/rancher/types v0.0.0-20191115181915-fa1ec441252a/go.mod h1:K5zlxVpe7bY2QgOs1YUcU8dVXtzKncxpGEcvxGMgr0k=
github.com/rancher/types v0.0.0-20191217214229-b0c77ca09648 h1:EE6TYL4w7h00rJ/OOi8HwY86+cjtSWKAanPtDrPIlAI= github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6 h1:RBAP4HUao0KqkoMdOXWn1dyDpp2ARZ1Du+HcwtM06gs=
github.com/rancher/types v0.0.0-20191217214229-b0c77ca09648/go.mod h1:bNhE/LSlF1urIf8XDdHyTe43J2YsHvuUeqWmKmrs8wg= github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6/go.mod h1:bNhE/LSlF1urIf8XDdHyTe43J2YsHvuUeqWmKmrs8wg=
github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk= github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk=
github.com/rancher/wrangler v0.1.5/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE= github.com/rancher/wrangler v0.1.5/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

28
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go generated vendored
View File

@@ -1828,14 +1828,14 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
CalicoNode: m("quay.io/calico/node:v3.10.2"), CalicoNode: m("quay.io/calico/node:v3.8.1"),
CalicoCNI: m("quay.io/calico/cni:v3.10.2"), CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.10.2"), CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"), CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
CanalNode: m("quay.io/calico/node:v3.10.2"), CanalNode: m("quay.io/calico/node:v3.8.1"),
CanalCNI: m("quay.io/calico/cni:v3.10.2"), CanalCNI: m("quay.io/calico/cni:v3.8.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"), CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
WeaveNode: m("weaveworks/weave-kube:2.5.2"), WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"), WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
@@ -1892,14 +1892,14 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
CalicoNode: m("quay.io/calico/node:v3.10.2"), CalicoNode: m("quay.io/calico/node:v3.8.1"),
CalicoCNI: m("quay.io/calico/cni:v3.10.2"), CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.10.2"), CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"), CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
CanalNode: m("quay.io/calico/node:v3.10.2"), CanalNode: m("quay.io/calico/node:v3.8.1"),
CanalCNI: m("quay.io/calico/cni:v3.10.2"), CanalCNI: m("quay.io/calico/cni:v3.8.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"), CanalFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
WeaveNode: m("weaveworks/weave-kube:2.5.2"), WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"), WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),

6
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/calico.go generated vendored
View File

@@ -675,7 +675,7 @@ data:
calico_backend: "bird" calico_backend: "bird"
# Configure the MTU to use # Configure the MTU to use
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}" veth_mtu: "{{.MTU}}"
{{- else }} {{- else }}
veth_mtu: "1440" veth_mtu: "1440"
@@ -1359,7 +1359,7 @@ data:
calico_backend: "bird" calico_backend: "bird"
# Configure the MTU to use # Configure the MTU to use
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}" veth_mtu: "{{.MTU}}"
{{- else }} {{- else }}
veth_mtu: "1440" veth_mtu: "1440"
@@ -2098,7 +2098,7 @@ data:
calico_backend: "bird" calico_backend: "bird"
# Configure the MTU to use # Configure the MTU to use
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}" veth_mtu: "{{.MTU}}"
{{- else }} {{- else }}
veth_mtu: "1440" veth_mtu: "1440"

6
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/canal.go generated vendored
View File

@@ -770,7 +770,7 @@ data:
"plugins": [ "plugins": [
{ {
"type": "calico", "type": "calico",
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
"mtu": {{.MTU}}, "mtu": {{.MTU}},
{{- end}} {{- end}}
"log_level": "WARNING", "log_level": "WARNING",
@@ -1380,7 +1380,7 @@ data:
"plugins": [ "plugins": [
{ {
"type": "calico", "type": "calico",
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
"mtu": {{.MTU}}, "mtu": {{.MTU}},
{{- end}} {{- end}}
"log_level": "WARNING", "log_level": "WARNING",
@@ -1829,7 +1829,7 @@ data:
"plugins": [ "plugins": [
{ {
"type": "calico", "type": "calico",
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
"mtu": {{.MTU}}, "mtu": {{.MTU}},
{{- end}} {{- end}}
"log_level": "WARNING", "log_level": "WARNING",

4
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/weave.go generated vendored
View File

@@ -59,7 +59,7 @@ items:
- name: WEAVE_PASSWORD - name: WEAVE_PASSWORD
value: "{{.WeavePassword}}" value: "{{.WeavePassword}}"
{{- end}} {{- end}}
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
- name: WEAVE_MTU - name: WEAVE_MTU
value: "{{.MTU}}" value: "{{.MTU}}"
{{- end }} {{- end }}
@@ -312,7 +312,7 @@ items:
- name: WEAVE_PASSWORD - name: WEAVE_PASSWORD
value: "{{.WeavePassword}}" value: "{{.WeavePassword}}"
{{- end}} {{- end}}
{{- if ne .MTU ""}} {{- if ne .MTU 0}}
- name: WEAVE_MTU - name: WEAVE_MTU
value: "{{.MTU}}" value: "{{.MTU}}"
{{- end }} {{- end }}

2
vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go generated vendored
View File

@@ -357,7 +357,7 @@ type NetworkConfig struct {
// Plugin options to configure network properties // Plugin options to configure network properties
Options map[string]string `yaml:"options" json:"options,omitempty"` Options map[string]string `yaml:"options" json:"options,omitempty"`
// Set MTU for CNI provider // Set MTU for CNI provider
MTU string `yaml:"mtu" json:"mtu,omitempty"` MTU int `yaml:"mtu" json:"mtu,omitempty"`
// CalicoNetworkProvider // CalicoNetworkProvider
CalicoNetworkProvider *CalicoNetworkProvider `yaml:"calico_network_provider,omitempty" json:"calicoNetworkProvider,omitempty"` CalicoNetworkProvider *CalicoNetworkProvider `yaml:"calico_network_provider,omitempty" json:"calicoNetworkProvider,omitempty"`
// CanalNetworkProvider // CanalNetworkProvider

4
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-20191221002039-8e3994417ca3 # github.com/rancher/kontainer-driver-metadata v0.0.0-20191223200943-7b4e4888b0c8
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
@@ -147,7 +147,7 @@ github.com/rancher/norman/types/convert
github.com/rancher/norman/types/definition github.com/rancher/norman/types/definition
github.com/rancher/norman/types/slice github.com/rancher/norman/types/slice
github.com/rancher/norman/types/values github.com/rancher/norman/types/values
# github.com/rancher/types v0.0.0-20191217214229-b0c77ca09648 # github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
github.com/rancher/types/apis/management.cattle.io/v3 github.com/rancher/types/apis/management.cattle.io/v3
github.com/rancher/types/apis/project.cattle.io/v3 github.com/rancher/types/apis/project.cattle.io/v3
github.com/rancher/types/condition github.com/rancher/types/condition