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

Merge pull request #932 from superseb/versionsaug5on21

Browse Source 
[release/v2.1] update k8s versions
This commit is contained in:
Craig Jellick
2019-08-05 11:17:45 -07:00
committed by GitHub
parent d3de784bc0 10a4e0fb14
commit 76e52238ac
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.13.5-rancher1-1"
DefaultK8s = "v1.13.9-rancher1-1"
)
var (
@@ -19,7 +19,7 @@ var (
k8sVersionsCurrent = []string{
"v1.11.9-rancher1-1",
"v1.12.7-rancher1-1",
"v1.13.5-rancher1-1",
"v1.13.9-rancher1-1",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -957,6 +957,34 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Added in Rancher v2.1.12
// Made available in v2.2.7 and v2.3.0 due to older rke-tools version
"v1.13.9-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.9-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.16"),
NginxProxy: m("rancher/rke-tools:v0.1.16"),
CertDownloader: m("rancher/rke-tools:v0.1.16"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
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.4.0"),
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.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"),
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
}
)

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

@@ -322,6 +322,10 @@ var (
)
func initWindows() {
// maxWindowsK8sVersion defines the max k8s versions we build for Windows
// we stopped building Windows images at 1.13.9
// we use v1.13.6 as max version because 1.13.5-rancher1 is higher/bigger than 1.13.5 and we dont use any versions between 1.13.5 and 1.13.9
maxWindowsK8sVersion := "v1.13.6"
badVersions := map[string]bool{
"v1.8.11-rancher2-1": true,
"v1.8.11-rancher1": true,
@@ -338,6 +342,9 @@ func initWindows() {
if badVersions[version] {
continue
}
if version > maxWindowsK8sVersion {
continue
}
images, ok := allK8sWindowsVersions[version]
if !ok {
@@ -347,7 +354,9 @@ func initWindows() {
K8sVersionWindowsSystemImages[version] = images
}
if _, ok := K8sVersionWindowsSystemImages[DefaultK8s]; !ok {
panic("Default K8s version " + DefaultK8s + " is not found in k8sVersionsCurrent list")
if maxWindowsK8sVersion > DefaultK8s {
if _, ok := K8sVersionWindowsSystemImages[DefaultK8s]; !ok {
panic("Default K8s version " + DefaultK8s + " is not found in k8sVersionsCurrent list")
}
}
}