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

update k8s to 1.11.9, 1.12.7, 1.13.5

Browse Source
This commit is contained in:
kinarashah
2019-03-26 09:33:06 -07:00
committed by Alena Prokharchyk
parent 597df5050c
commit e3a7b1174d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.13.4-rancher1-2"
DefaultK8s = "v1.13.5-rancher1-2"
)
var (
@@ -24,12 +24,12 @@ var (
// K8sVersionsCurrent are the latest versions available for installation
K8sVersionsCurrent = []string{
"v1.11.8-rancher1-1",
"v1.11.9-rancher1-1",
// 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.12.6-rancher1-2",
"v1.13.4-rancher1-2",
"v1.12.7-rancher1-2",
"v1.13.5-rancher1-2",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -874,9 +874,9 @@ var (
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
"v1.12.6-rancher1-2": {
"v1.12.7-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.12.6-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.27"),
NginxProxy: m("rancher/rke-tools:v0.1.27"),
CertDownloader: m("rancher/rke-tools:v0.1.27"),
@@ -958,9 +958,9 @@ var (
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
"v1.13.4-rancher1-2": {
"v1.13.5-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.5-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.27"),
NginxProxy: m("rancher/rke-tools:v0.1.27"),
CertDownloader: m("rancher/rke-tools:v0.1.27"),

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

@@ -249,9 +249,9 @@ var (
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.12.6-rancher1-2": {
"v1.12.7-rancher1-2": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.12.6-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.12.7-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
@@ -285,9 +285,9 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.13.4-rancher1-2": {
"v1.13.5-rancher1-2": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.13.4-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.13.5-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"),