1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 08:24:28 +00:00

vendor update

This commit is contained in:
kinarashah
2020-01-16 10:40:57 -08:00
parent 38f9b2902e
commit a12280e06f
8 changed files with 19 additions and 15 deletions

View File

@@ -1907,7 +1907,7 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.7.1"),
WindowsPodInfraContainer: m("rancher/kubelet-pause:v0.1.3"),
},
//Experimental in Rancher v2.3.4
//Enabled in Rancher v2.3.4
"v1.17.0-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.4.3-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.17.0-rancher1"),

View File

@@ -59,6 +59,10 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo {
MaxRancherVersion: "2.3.1",
MaxRKEVersion: "0.3.1",
},
"v1.14": {
MaxRancherVersion: "2.3.3",
MaxRKEVersion: "1.0.0",
},
"v1.15.5-rancher1-1": {
MaxRancherVersion: "2.2.9",
MaxRKEVersion: "0.2.8",

View File

@@ -675,7 +675,7 @@ data:
calico_backend: "bird"
# Configure the MTU to use
{{- if ne .MTU 0}}
{{- if ne (default 0 .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 0}}
{{- if ne (default 0 .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 0}}
{{- if ne (default 0 .MTU) 0}}
veth_mtu: "{{.MTU}}"
{{- else }}
veth_mtu: "1440"
@@ -2890,7 +2890,7 @@ data:
calico_backend: "bird"
# Configure the MTU to use
{{- if ne .MTU 0}}
{{- if ne (default 0 .MTU) 0}}
veth_mtu: "{{.MTU}}"
{{- else }}
veth_mtu: "1440"

View File

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

View File

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