rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-05-10 08:04:20 +00:00
Code Issues Releases Wiki Activity

Support v1.11.3 as default k8s version

Browse Source
This commit is contained in:
carolyn 2018-09-14 17:37:34 -07:00 committed by Alena Prokharchyk
parent 6a993793e3
commit 92b37efdc7
2 changed files with 36 additions and 2 deletions
apis/management.cattle.io/v3
k8s_defaults.gok8s_windows_default.go

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

@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.11.2-rancher1-2"
DefaultK8s = "v1.11.3-rancher1-1"
)
var (
@ -19,7 +19,7 @@ var (
k8sVersionsCurrent = []string{
"v1.9.7-rancher2-2",
"v1.10.5-rancher1-2",
"v1.11.2-rancher1-2",
"v1.11.3-rancher1-1",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@ -490,6 +490,32 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.11.3-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.3-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.14"),
NginxProxy: m("rancher/rke-tools:v0.1.14"),
CertDownloader: m("rancher/rke-tools:v0.1.14"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.14"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
CalicoNode: m("quay.io/calico/node:v3.1.3"),
CalicoCNI: m("quay.io/calico/cni:v3.1.3"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.1.3"),
CanalCNI: m("quay.io/calico/cni:v3.1.3"),
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
}
)

8
apis/management.cattle.io/v3/k8s_windows_default.go
View File

@ -172,6 +172,14 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.11.3-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.11.3-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"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
}
)