diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 3af40476..b238686d 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -9,7 +9,7 @@ import ( ) const ( - DefaultK8s = "v1.13.5-rancher1-2" + DefaultK8s = "v1.13.5-rancher1-3" ) var ( @@ -24,12 +24,12 @@ var ( // K8sVersionsCurrent are the latest versions available for installation K8sVersionsCurrent = []string{ - "v1.11.9-rancher1-1", + "v1.11.9-rancher1-2", // When add a new k8s version to 2.2, make sure to add support for it to the 2.1.x branch. // Account for the fact that rke-tools image is different cross branches, and it requires using // different k8s version tag - "v1.12.7-rancher1-2", - "v1.13.5-rancher1-2", + "v1.12.7-rancher1-3", + "v1.13.5-rancher1-3", "v1.14.1-rancher1-1", } diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 9cc7e1ec..da7c9d1c 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -205,7 +205,7 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.11.9-rancher1-1": { + "v1.11.9-rancher1-2": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.11.9-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), @@ -264,7 +264,7 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.12.7-rancher1-2": { + "v1.12.7-rancher1-3": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.12.7-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), @@ -308,7 +308,7 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.13.5-rancher1-2": { + "v1.13.5-rancher1-3": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.13.5-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),