rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-18 16:10:58 +00:00
Code Issues Releases Wiki Activity

Add 1.13.9-rancher1-1 and ignore Windows builds

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2019-08-05 19:17:42 +02:00
parent ed63aa5716
commit 10a4e0fb14
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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,9 +957,11 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
"v1.13.5-rancher1-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.5-rancher1"),
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"),

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")
}
}
}