vendor update

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/mattn/go-colorable v0.1.0
 	github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20200116174051-6b21affb3bdd
 	github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
 	github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
 	github.com/sirupsen/logrus v1.4.2

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/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/kontainer-driver-metadata v0.0.0-20200113180946-882815341981 h1:p9hrvFef5NU5oD75AmZHt/+c3zJHvmMa7HRA/nKqu7Q=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200116174051-6b21affb3bdd h1:9TYvqVc/ddgXTfy5j/ethwC+TzwzfJcpXdKhQVDiCf4=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200116174051-6b21affb3bdd/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/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
 github.com/rancher/norman v0.0.0-20191126010027-3afadb987c81 h1:40IyRSjbSj/jNHpJFOHGOlUvOCIQKUMF6p8Tcc/w1vs=

vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go

@@ -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"),

vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go

@@ -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",

vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/calico.go

@@ -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"

vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/canal.go

@@ -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",

vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/weave.go

@@ -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 }}

vendor/modules.txt

@@ -129,7 +129,7 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/util
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20200116174051-6b21affb3bdd
 github.com/rancher/kontainer-driver-metadata/rke
 github.com/rancher/kontainer-driver-metadata/rke/templates
 # github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222