From a4ba8342e20652967e58c9e2e33f1a28a9f871fe Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 1 Mar 2019 22:45:17 +0200 Subject: [PATCH] Update k8s to v1.11.8 and v1.13.4 --- apis/management.cattle.io/v3/k8s_defaults.go | 14 +++++++------- .../management.cattle.io/v3/k8s_windows_default.go | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index a7b12cf8..67845e28 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.1-rancher1-1" + DefaultK8s = "v1.13.4-rancher1-1" ) var ( @@ -17,9 +17,9 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ - "v1.11.6-rancher1-1", + "v1.11.8-rancher1-1", "v1.12.6-rancher1-1", - "v1.13.1-rancher1-1", + "v1.13.4-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -639,9 +639,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.11.6-rancher1-1": { + "v1.11.8-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), - Kubernetes: m("rancher/hyperkube:v1.11.6-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.11.8-rancher1"), Alpine: m("rancher/rke-tools:v0.1.15"), NginxProxy: m("rancher/rke-tools:v0.1.15"), CertDownloader: m("rancher/rke-tools:v0.1.15"), @@ -847,9 +847,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, - "v1.13.1-rancher1-1": { + "v1.13.4-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), - Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.13.4-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"), diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 3b321634..448d1b18 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -222,9 +222,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.11.6-rancher1-1": { + "v1.11.8-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.11.6-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.8-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), @@ -286,9 +286,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.13.1-rancher1-1": { + "v1.13.4-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.13.4-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),