1
0
mirror of https://github.com/rancher/types.git synced 2025-09-25 12:21:24 +00:00

rke-tools update

This commit is contained in:
Alena Prokharchyk
2019-07-24 16:31:26 -07:00
parent 2d438371fa
commit 5ae59f2065

View File

@@ -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"),