rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-07 18:12:06 +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

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"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
CalicoNode: m("quay.io/calico/node:v3.10.2"),
CalicoCNI: m("quay.io/calico/cni:v3.10.2"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.10.2"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"),
CanalNode: m("quay.io/calico/node:v3.10.2"),
CanalCNI: m("quay.io/calico/cni:v3.10.2"),
CalicoNode: m("quay.io/calico/node:v3.8.1"),
CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
CanalNode: m("quay.io/calico/node:v3.8.1"),
CanalCNI: m("quay.io/calico/cni:v3.8.1"),
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"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
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"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
CalicoNode: m("quay.io/calico/node:v3.10.2"),
CalicoCNI: m("quay.io/calico/cni:v3.10.2"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.10.2"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.10.2"),
CanalNode: m("quay.io/calico/node:v3.10.2"),
CanalCNI: m("quay.io/calico/cni:v3.10.2"),
CalicoNode: m("quay.io/calico/node:v3.8.1"),
CalicoCNI: m("quay.io/calico/cni:v3.8.1"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.1"),
CalicoFlexVol: m("quay.io/calico/pod2daemon-flexvol:v3.8.1"),
CanalNode: m("quay.io/calico/node:v3.8.1"),
CanalCNI: m("quay.io/calico/cni:v3.8.1"),
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"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
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"
# Configure the MTU to use
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}"
{{- else }}
veth_mtu: "1440"
@@ -1359,7 +1359,7 @@ data:
calico_backend: "bird"
# Configure the MTU to use
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}"
{{- else }}
veth_mtu: "1440"
@@ -2098,7 +2098,7 @@ data:
calico_backend: "bird"
# Configure the MTU to use
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
veth_mtu: "{{.MTU}}"
{{- else }}
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": [
{
"type": "calico",
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
"mtu": {{.MTU}},
{{- end}}
"log_level": "WARNING",
@@ -1380,7 +1380,7 @@ data:
"plugins": [
{
"type": "calico",
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
"mtu": {{.MTU}},
{{- end}}
"log_level": "WARNING",
@@ -1829,7 +1829,7 @@ data:
"plugins": [
{
"type": "calico",
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
"mtu": {{.MTU}},
{{- end}}
"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
value: "{{.WeavePassword}}"
{{- end}}
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
- name: WEAVE_MTU
value: "{{.MTU}}"
{{- end }}
@@ -312,7 +312,7 @@ items:
- name: WEAVE_PASSWORD
value: "{{.WeavePassword}}"
{{- end}}
{{- if ne .MTU ""}}
{{- if ne .MTU 0}}
- name: WEAVE_MTU
value: "{{.MTU}}"
{{- 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
Options map[string]string `yaml:"options" json:"options,omitempty"`
// Set MTU for CNI provider
MTU string `yaml:"mtu" json:"mtu,omitempty"`
MTU int `yaml:"mtu" json:"mtu,omitempty"`
// CalicoNetworkProvider
CalicoNetworkProvider *CalicoNetworkProvider `yaml:"calico_network_provider,omitempty" json:"calicoNetworkProvider,omitempty"`
// CanalNetworkProvider