Add v1.13.9

vendor.conf

@@ -39,8 +39,8 @@ github.com/rancher/rdns-server                bf662911db6acce4d6a85d2878653f6841
 
 
 github.com/rancher/norman                     29dda4ec1235976b6b27c32047ae0e8894f0c8e0
-github.com/rancher/types                      d3de784bc03c600fe06bf00d2d8ba0ac351e1e6b
-github.com/rancher/rke                        d547456e39df75f2ef4c2abf37c9dbd35c18537f
+github.com/rancher/types                      76e52238acbdffb5d97fdb0c603deedb6686b241
+github.com/rancher/rke                        25e23a8cc4d5cfe3f57b14761e2ef9068edc96d4
 github.com/rancher/kontainer-engine           7c6eb5aed714600bfe9d579ebafa4aebac91646b
 
 gopkg.in/ldap.v2     v2.5.0

vendor/github.com/rancher/rke/vendor.conf

@@ -24,6 +24,6 @@ github.com/ugorji/go  	                 ccfe18359b55b97855cee1d3f74e5efbda4869dc
 github.com/Microsoft/go-winio            ab35fc04b6365e8fcb18e6e9e41ea4a02b10b175
 github.com/go-ini/ini                    06f5f3d67269ccec1fe5fe4134ba6e982984f7f5
 github.com/rancher/norman                27672c8d7a1fbb0af6eab0d71982843511b404fd
-github.com/rancher/types                 d3de784bc03c600fe06bf00d2d8ba0ac351e1e6b
+github.com/rancher/types                 76e52238acbdffb5d97fdb0c603deedb6686b241
 github.com/beorn7/perks			 3a771d992973f24aa725d07868b467d1ddfceafb
 github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c

vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	DefaultK8s = "v1.13.5-rancher1-1"
+	DefaultK8s = "v1.13.9-rancher1-1"
 )
 
 var (
@@ -19,7 +19,7 @@ var (
 	k8sVersionsCurrent = []string{
 		"v1.11.9-rancher1-1",
 		"v1.12.7-rancher1-1",
-		"v1.13.5-rancher1-1",
+		"v1.13.9-rancher1-1",
 	}
 
 	// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -957,6 +957,34 @@ var (
 			IngressBackend:            m("k8s.gcr.io/defaultbackend:1.4"),
 			MetricsServer:             m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
 		},
+		// Added in Rancher v2.1.12
+		// Made available in v2.2.7 and v2.3.0 due to older rke-tools version
+		"v1.13.9-rancher1-1": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
+			Kubernetes:                m("rancher/hyperkube:v1.13.9-rancher1"),
+			Alpine:                    m("rancher/rke-tools:v0.1.16"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.16"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.16"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
+			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
+			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
+			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
+			KubeDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
+			Flannel:                   m("quay.io/coreos/flannel:v0.10.0"),
+			FlannelCNI:                m("quay.io/coreos/flannel-cni:v0.3.0"),
+			CalicoNode:                m("quay.io/calico/node:v3.4.0"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.4.0"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CanalNode:                 m("quay.io/calico/node:v3.4.0"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.4.0"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.10.0"),
+			WeaveNode:                 m("weaveworks/weave-kube:2.5.0"),
+			WeaveCNI:                  m("weaveworks/weave-npc:2.5.0"),
+			PodInfraContainer:         m("gcr.io/google_containers/pause-amd64:3.1"),
+			Ingress:                   m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
+			IngressBackend:            m("k8s.gcr.io/defaultbackend:1.4"),
+			MetricsServer:             m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
+		},
 	}
 )
 

vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go

@@ -322,6 +322,10 @@ var (
 )
 
 func initWindows() {
+	// maxWindowsK8sVersion defines the max k8s versions we build for Windows
+	// we stopped building Windows images at 1.13.9
+	// we use v1.13.6 as max version because 1.13.5-rancher1 is higher/bigger than 1.13.5 and we dont use any versions between 1.13.5 and 1.13.9
+	maxWindowsK8sVersion := "v1.13.6"
 	badVersions := map[string]bool{
 		"v1.8.11-rancher2-1": true,
 		"v1.8.11-rancher1":   true,
@@ -338,6 +342,9 @@ func initWindows() {
 		if badVersions[version] {
 			continue
 		}
+		if version > maxWindowsK8sVersion {
+			continue
+		}
 
 		images, ok := allK8sWindowsVersions[version]
 		if !ok {
@@ -347,7 +354,9 @@ func initWindows() {
 		K8sVersionWindowsSystemImages[version] = images
 	}
 
-	if _, ok := K8sVersionWindowsSystemImages[DefaultK8s]; !ok {
-		panic("Default K8s version " + DefaultK8s + " is not found in k8sVersionsCurrent list")
+	if maxWindowsK8sVersion > DefaultK8s {
+		if _, ok := K8sVersionWindowsSystemImages[DefaultK8s]; !ok {
+			panic("Default K8s version " + DefaultK8s + " is not found in k8sVersionsCurrent list")
+		}
 	}
 }