From d914a93d5de1ff4259233569f7b0eb2d73b3161f Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 30 Jul 2019 15:23:48 -0700 Subject: [PATCH] k8s 1.12.10 support --- apis/management.cattle.io/v3/k8s_defaults.go | 16 ++++++++-------- .../v3/k8s_windows_default.go | 6 ++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 38c239a4..04b0e033 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -27,7 +27,7 @@ var ( // When add a new k8s version to 2.2, make sure to add support for it to the 2.1.x branch. // Account for the fact that rke-tools image is different cross branches, and it requires using // different k8s version tag - "v1.12.9-rancher1-1", + "v1.12.10-rancher1-1", "v1.13.8-rancher1-1", "v1.14.4-rancher1-1", "v1.15.0-rancher1-2", @@ -1019,14 +1019,14 @@ var ( CoreDNS: m("coredns/coredns:1.2.2"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, - // Enabled in Rancher v2.2.5 - "v1.12.9-rancher1-1": { + // Enabled in Rancher v2.2.7 + "v1.12.10-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.12.9-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.34"), - NginxProxy: m("rancher/rke-tools:v0.1.34"), - CertDownloader: m("rancher/rke-tools:v0.1.34"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"), + Kubernetes: m("rancher/hyperkube:v1.12.10-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.39"), + NginxProxy: m("rancher/rke-tools:v0.1.39"), + CertDownloader: m("rancher/rke-tools:v0.1.39"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.39"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.14.13"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.14.13"), diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 97c9b2c4..a0147ffa 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -285,6 +285,12 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.12.10-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.10-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.13.1-rancher1-2": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"),