rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-26 20:52:57 +00:00
Code Issues Releases Wiki Activity

v1.13.12-rancher2-2, v1.14.10-rancher1-2, v1.15.12-rancher1-1

Browse Source
This commit is contained in:
kinarashah
2020-05-19 14:48:33 -07:00
parent f084ef5396
commit 48d84dffda
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.15.11-rancher1-0"
DefaultK8s = "v1.15.12-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.13.12-rancher1-1",
"v1.14.10-rancher1-0",
"v1.15.11-rancher1-0",
"v1.13.12-rancher2-2",
"v1.14.10-rancher1-2",
"v1.15.12-rancher1-1",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -1308,10 +1308,10 @@ 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.9
"v1.13.12-rancher1-1": {
// Enabled in Rancher v2.2.13
"v1.13.12-rancher2-2": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.12-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.12-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.50"),
NginxProxy: m("rancher/rke-tools:v0.1.50"),
CertDownloader: m("rancher/rke-tools:v0.1.50"),
@@ -1331,7 +1331,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.32.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.6"),
@@ -1599,14 +1599,14 @@ var (
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.2.11
"v1.14.10-rancher1-0": {
// Enabled in Rancher v2.2.13
"v1.14.10-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.10-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.50"),
NginxProxy: m("rancher/rke-tools:v0.1.50"),
CertDownloader: m("rancher/rke-tools:v0.1.50"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
Alpine: m("rancher/rke-tools:v0.1.52"),
NginxProxy: m("rancher/rke-tools:v0.1.52"),
CertDownloader: m("rancher/rke-tools:v0.1.52"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
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"),
@@ -1623,7 +1623,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.32.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.3.1"),
@@ -1809,14 +1809,14 @@ var (
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.2.11
"v1.15.11-rancher1-0": {
// Enabled in Rancher v2.2.13
"v1.15.12-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.11-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.50"),
NginxProxy: m("rancher/rke-tools:v0.1.50"),
CertDownloader: m("rancher/rke-tools:v0.1.50"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"),
Kubernetes: m("rancher/hyperkube:v1.15.12-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.56"),
NginxProxy: m("rancher/rke-tools:v0.1.56"),
CertDownloader: m("rancher/rke-tools:v0.1.56"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.56"),
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"),
@@ -1833,7 +1833,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.32.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"),
CoreDNS: m("coredns/coredns:1.3.1"),