From c0e0d4dd2bf7f2897e3424e81f2c9eaec99b830f Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 6 Dec 2018 01:21:18 +0200 Subject: [PATCH] upgrade to v1.11.5-rancher1-1, v1.10.11-rancher1-1 --- apis/management.cattle.io/v3/k8s_defaults.go | 12 ++++++------ apis/management.cattle.io/v3/k8s_windows_default.go | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index ee84db27..8877aa3f 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -18,8 +18,8 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", - "v1.10.5-rancher1-2", - "v1.11.3-rancher1-1", + "v1.10.11-rancher1-1", + "v1.11.5-rancher1-1", "v1.12.3-rancher1-1", } @@ -420,9 +420,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"), @@ -550,9 +550,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.11.3-rancher1-1": { + "v1.11.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), - Kubernetes: m("rancher/hyperkube:v1.11.3-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.11.5-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 57000420..b7eccadd 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -158,9 +158,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.10.5-rancher1-2": { + "v1.10.11-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.10.5-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.10.11-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"), @@ -198,9 +198,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.11.3-rancher1-1": { + "v1.11.5-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.11.3-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.5-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"),