From df0c8d4f7479ce0e194d7df55bfd6713262fd8f8 Mon Sep 17 00:00:00 2001 From: kinarashah Date: Wed, 12 Jun 2019 09:57:46 -0700 Subject: [PATCH] k8s 1.12.9, 1.13.7, 1.14.3 --- apis/management.cattle.io/v3/k8s_defaults.go | 47 ++++++++++--------- .../v3/k8s_windows_default.go | 12 ++--- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 6c8b8f44..afde72c1 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.14.1-rancher1-2" + DefaultK8s = "v1.14.3-rancher1-1" ) var ( @@ -27,9 +27,9 @@ 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.7-rancher1-3", - "v1.13.5-rancher1-3", - "v1.14.1-rancher1-2", + "v1.12.9-rancher1-1", + "v1.13.7-rancher1-1", + "v1.14.3-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -972,13 +972,14 @@ var ( CoreDNS: m("coredns/coredns:1.2.2"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, - "v1.12.7-rancher1-3": { + // Enabled in Rancher v2.2.5 + "v1.12.9-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.28"), - NginxProxy: m("rancher/rke-tools:v0.1.28"), - CertDownloader: m("rancher/rke-tools:v0.1.28"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + Kubernetes: m("rancher/hyperkube:v1.12.9-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.31"), + NginxProxy: m("rancher/rke-tools:v0.1.31"), + CertDownloader: m("rancher/rke-tools:v0.1.31"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.31"), 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"), @@ -1113,13 +1114,14 @@ var ( CoreDNS: m("coredns/coredns:1.2.6"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, - "v1.13.5-rancher1-3": { + // Enabled in Rancher v2.2.5 + "v1.13.7-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.13.5-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.28"), - NginxProxy: m("rancher/rke-tools:v0.1.28"), - CertDownloader: m("rancher/rke-tools:v0.1.28"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + Kubernetes: m("rancher/hyperkube:v1.13.7-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.31"), + NginxProxy: m("rancher/rke-tools:v0.1.31"), + CertDownloader: m("rancher/rke-tools:v0.1.31"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.31"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), @@ -1198,13 +1200,14 @@ var ( CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, - "v1.14.1-rancher1-2b": { + // Enabled in Rancher v2.2.5 + "v1.14.3-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.14.1-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.28"), - NginxProxy: m("rancher/rke-tools:v0.1.28"), - CertDownloader: m("rancher/rke-tools:v0.1.28"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + Kubernetes: m("rancher/hyperkube:v1.14.3-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.31"), + NginxProxy: m("rancher/rke-tools:v0.1.31"), + CertDownloader: m("rancher/rke-tools:v0.1.31"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.31"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 84d45ccf..cb9df803 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -278,9 +278,9 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.12.7-rancher1-3": { + "v1.12.9-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.12.7-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.9-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, @@ -330,9 +330,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.13.5-rancher1-3": { + "v1.13.7-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.13.5-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.13.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"), @@ -352,9 +352,9 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"), KubeletPause: m("rancher/kubelet-pause:v0.1.2"), }, - "v1.14.1-rancher1-2": { + "v1.14.3-rancher1-1": { // NginxProxy image is replaced by host running nginx, fixed rancher#16074 - KubernetesBinaries: m("rancher/hyperkube:v1.14.1-rancher2"), + KubernetesBinaries: m("rancher/hyperkube:v1.14.3-rancher1"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"), KubeletPause: m("rancher/kubelet-pause:v0.1.2"), },