diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 7548d1a5..175bc320 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -18,9 +18,9 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", - "v1.10.11-rancher1-1", + "v1.10.12-rancher1-1", "v1.11.6-rancher1-1", - "v1.12.3-rancher1-1", + "v1.12.4-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -449,9 +449,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "v1.10.11-rancher1-1": { + "v1.10.12-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("rancher/hyperkube:v1.10.11-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.10.12-rancher1"), Alpine: m("rancher/rke-tools:v0.1.13"), NginxProxy: m("rancher/rke-tools:v0.1.13"), CertDownloader: m("rancher/rke-tools:v0.1.13"), @@ -709,9 +709,9 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, - "v1.12.3-rancher1-1": { + "v1.12.4-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), - Kubernetes: m("rancher/hyperkube:v1.12.3-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.12.4-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"), diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 5d51eb67..b528a1cc 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -166,9 +166,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.10.11-rancher1-1": { + "v1.10.12-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.10.11-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.10.12-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"), @@ -246,9 +246,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.12.3-rancher1-1": { + "v1.12.4-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.12.3-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.4-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"),