From b58a0c7f191d508550e213986bda12eda1824de7 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Tue, 4 Dec 2018 18:52:52 +0200 Subject: [PATCH] update to v1.11.5-rancher1-1, v1.10.11-rancher1-1 --- apis/management.cattle.io/v3/k8s_defaults.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index a402184b..d91993fa 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -8,7 +8,7 @@ import ( ) const ( - DefaultK8s = "v1.11.2-rancher1-1" + DefaultK8s = "v1.11.5-rancher1-1" ) var ( @@ -17,8 +17,8 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", - "v1.10.5-rancher1-2", - "v1.11.2-rancher1-1", + "v1.10.11-rancher1-1", + "v1.11.5-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -404,9 +404,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.10.5-rancher1-2": { + "v1.10.11-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.10.11-rancher1"), Alpine: m("rancher/rke-tools:v0.1.13"), NginxProxy: m("rancher/rke-tools:v0.1.13"), CertDownloader: m("rancher/rke-tools:v0.1.13"), @@ -482,9 +482,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.11.2-rancher1-1": { + "v1.11.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), - Kubernetes: m("rancher/hyperkube:v1.11.2-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.11.5-rancher1"), Alpine: m("rancher/rke-tools:v0.1.13"), NginxProxy: m("rancher/rke-tools:v0.1.13"), CertDownloader: m("rancher/rke-tools:v0.1.13"),