rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-25 12:21:24 +00:00
Code Issues Releases Wiki Activity

v1.14.10-rancher1-1, v1.15.11-rancher1-0

Browse Source
This commit is contained in:
kinarashah
2020-03-27 15:54:03 -07:00
parent 7f54d10ef0
commit db2950f196
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.15.5-rancher1-1"
DefaultK8s = "v1.15.11-rancher1-0"
)
var (
@@ -28,8 +28,8 @@ var (
// 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.8-rancher1-1",
"v1.15.5-rancher1-1",
"v1.14.10-rancher1-1",
"v1.15.11-rancher1-0",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -1540,14 +1540,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.9
"v1.14.8-rancher1-1": {
// Enabled in Rancher v2.2.10
"v1.14.10-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.8-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.14.10-rancher1"),
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"),
@@ -1557,6 +1557,7 @@ var (
CalicoNode: m("quay.io/calico/node:v3.4.0"),
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.4.0"),
CanalNode: m("quay.io/calico/node:v3.4.0"),
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
@@ -1719,26 +1720,26 @@ 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.9
"v1.15.5-rancher1-1": {
// Enabled in Rancher v2.2.11
"v1.15.11-rancher1-0": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.5-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.11-rancher1"),
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"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
CalicoNode: m("quay.io/calico/node:v3.7.4"),
CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
CalicoNode: m("quay.io/calico/node:v3.13.0"),
CalicoCNI: m("quay.io/calico/cni:v3.13.0"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
CanalNode: m("quay.io/calico/node:v3.7.4"),
CanalCNI: m("quay.io/calico/cni:v3.7.4"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.13.0"),
CanalNode: m("quay.io/calico/node:v3.13.0"),
CanalCNI: m("quay.io/calico/cni:v3.13.0"),
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),