From c8e028e67a0c30cb73c22b7a350c5c611fbd6482 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 18 Dec 2018 21:41:03 -0800 Subject: [PATCH] k8s 1.11.6 support --- apis/management.cattle.io/v3/k8s_defaults.go | 6 +++--- apis/management.cattle.io/v3/k8s_windows_default.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 97a8b1a3..f951bd03 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -19,7 +19,7 @@ var ( k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", "v1.10.11-rancher1-1", - "v1.11.5-rancher1-1", + "v1.11.6-rancher1-1", "v1.12.3-rancher1-1", } @@ -576,9 +576,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.11.5-rancher1-1": { + "v1.11.6-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), - Kubernetes: m("rancher/hyperkube:v1.11.5-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.11.6-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 a6b35abd..696b9e87 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -206,9 +206,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.11.5-rancher1-1": { + "v1.11.6-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.11.5-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.6-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"),