From 5ae59f20659feba8a6f32cd11ad130ae47ffeca1 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 24 Jul 2019 16:31:26 -0700 Subject: [PATCH] rke-tools update --- apis/management.cattle.io/v3/k8s_defaults.go | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 1fca76dd..c790bf72 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.3-rancher1-1" + DefaultK8s = "v1.14.4-rancher1-1" ) var ( @@ -28,9 +28,9 @@ var ( // 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.13.7-rancher1-1", - "v1.14.3-rancher1-1", - "v1.15.0-rancher1-1", + "v1.13.8-rancher1-1", + "v1.14.4-rancher1-1", + "v1.15.0-rancher1-2", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -1153,14 +1153,14 @@ var ( CoreDNS: m("coredns/coredns:1.2.6"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, - // Enabled in Rancher v2.2.5 - "v1.13.7-rancher1-1": { + // Enabled in Rancher v2.2.7 + "v1.13.8-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.13.7-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.13.8-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.38"), + NginxProxy: m("rancher/rke-tools:v0.1.38"), + CertDownloader: m("rancher/rke-tools:v0.1.38"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.38"), 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"), @@ -1267,14 +1267,14 @@ var ( MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), - }, // Enabled in Rancher v2.2.5 - "v1.14.3-rancher1-1": { + }, // Enabled in Rancher v2.2.7 + "v1.14.4-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.14.3-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.14.4-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.38"), + NginxProxy: m("rancher/rke-tools:v0.1.38"), + CertDownloader: m("rancher/rke-tools:v0.1.38"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.38"), 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"), @@ -1326,14 +1326,14 @@ var ( CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, - // Experimental in Rancher v2.2.5 - "v1.15.0-rancher1-1": { + // Experimental in Rancher v2.2.7 + "v1.15.0-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.15.0-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"), + Alpine: m("rancher/rke-tools:v0.1.38"), + NginxProxy: m("rancher/rke-tools:v0.1.38"), + CertDownloader: m("rancher/rke-tools:v0.1.38"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.38"), 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"),