From 69a7ac7dcfde9274c0f90f432f6a2b5dfc6ae273 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 4 Dec 2018 08:19:31 -0800 Subject: [PATCH] k8s v1.11.5, v1.10.11, v1.12.3 --- apis/management.cattle.io/v3/k8s_defaults.go | 84 ++++++++++++++++++- .../v3/k8s_windows_default.go | 24 ++++++ 2 files changed, 104 insertions(+), 4 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 267d46f1..25778ef9 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -9,7 +9,7 @@ import ( ) const ( - DefaultK8s = "v1.11.3-rancher1-1" + DefaultK8s = "v1.11.5-rancher1-1" ) var ( @@ -18,9 +18,9 @@ var ( // k8sVersionsCurrent are the latest versions available for installation k8sVersionsCurrent = []string{ "v1.9.7-rancher2-2", - "v1.10.5-rancher1-2", - "v1.11.3-rancher1-1", - "v1.12.1-rancher1-1", + "v1.10.11-rancher1-1", + "v1.11.5-rancher1-1", + "v1.12.3-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -422,6 +422,31 @@ var ( 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"), + }, "v1.10.11-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.11-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"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.13"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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"), }, "v1.11.1-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), @@ -527,6 +552,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.11.5-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.18"), + Kubernetes: m("rancher/hyperkube:v1.11.5-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.15"), + NginxProxy: m("rancher/rke-tools:v0.1.15"), + CertDownloader: m("rancher/rke-tools:v0.1.15"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.15"), + 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"), + }, "v1.12.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"), @@ -578,6 +629,31 @@ var ( 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.3.1"), + }, "v1.12.3-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Kubernetes: m("rancher/hyperkube:v1.12.3-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.14.13"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"), + 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.3.1"), }, } ) diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index fcdaa85a..b7eccadd 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -158,6 +158,14 @@ 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": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.10.11-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"), + }, "v1.11.1-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.11.1-nanoserver-1803"), @@ -190,6 +198,14 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.11.5-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.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"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.12.0-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"), @@ -206,6 +222,14 @@ 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": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.12.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"), + }, } )