From 76039fc98385de113c66dac4090e90b426cc30c1 Mon Sep 17 00:00:00 2001 From: kinarashah Date: Tue, 26 Mar 2019 08:37:15 -0700 Subject: [PATCH] update k8s v1.11.9, v1.12.7, v1.13.5 --- apis/management.cattle.io/v3/k8s_defaults.go | 20 +++++++++---------- .../v3/k8s_windows_default.go | 12 +++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index e5f8b0b4..101df410 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.4-rancher1-1" + DefaultK8s = "v1.13.5-rancher1-1" ) var ( @@ -17,9 +17,9 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ - "v1.11.8-rancher1-1", - "v1.12.6-rancher1-1", - "v1.13.4-rancher1-1", + "v1.11.9-rancher1-1", + "v1.12.7-rancher1-1", + "v1.13.5-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -665,9 +665,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.11.8-rancher1-1": { + "v1.11.9-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), - Kubernetes: m("rancher/hyperkube:v1.11.8-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.11.9-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.12.6-rancher1-1": { + "v1.12.7-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), - Kubernetes: m("rancher/hyperkube:v1.12.6-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.12.7-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"), @@ -925,9 +925,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, - "v1.13.4-rancher1-1": { + "v1.13.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), - Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.13.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 c752d134..6e683a13 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -230,9 +230,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.11.8-rancher1-1": { + "v1.11.9-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.11.8-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.9-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.12.6-rancher1-1": { + "v1.12.7-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.12.6-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.7-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"), @@ -310,9 +310,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.13.4-rancher1-1": { + "v1.13.5-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.13.4-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.13.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"),