diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go
index 07951b57..e6554fd8 100644
--- a/apis/management.cattle.io/v3/k8s_defaults.go
+++ b/apis/management.cattle.io/v3/k8s_defaults.go
@@ -17,8 +17,8 @@ var (
// k8sVersionsCurrent are the latest versions available for installation
k8sVersionsCurrent = []string{
- "v1.11.9-rancher1-1",
- "v1.12.7-rancher1-1",
+ "v1.11.9-rancher1-3",
+ "v1.12.7-rancher1-4",
"v1.13.10-rancher1-1",
}
@@ -697,6 +697,34 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
+ // Made available in v2.2.8 and v2.3.0 due to older rke-tools version
+ // Added to bump rke-tools v0.1.16-2 which is compiled using Go 1.12.9
+ "v1.11.9-rancher1-3": {
+ Etcd: m("quay.io/coreos/etcd:v3.2.18"),
+ Kubernetes: m("rancher/hyperkube:v1.11.9-rancher1"),
+ Alpine: m("rancher/rke-tools:v0.1.16-2"),
+ NginxProxy: m("rancher/rke-tools:v0.1.16-2"),
+ CertDownloader: m("rancher/rke-tools:v0.1.16-2"),
+ KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-2"),
+ 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"),
@@ -879,6 +907,34 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
+ // Made available in v2.2.8 and v2.3.0 due to older rke-tools version
+ // Added to bump rke-tools v0.1.16-2 which is compiled using Go 1.12.9
+ "v1.12.7-rancher1-4": {
+ Etcd: m("quay.io/coreos/etcd:v3.2.24"),
+ Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"),
+ Alpine: m("rancher/rke-tools:v0.1.16-2"),
+ NginxProxy: m("rancher/rke-tools:v0.1.16-2"),
+ CertDownloader: m("rancher/rke-tools:v0.1.16-2"),
+ KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-2"),
+ 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.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"),
+ },
"v1.13.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"),
@@ -986,14 +1042,15 @@ var (
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Added in Rancher v2.1.13
+ // Added to bump rke-tools v0.1.16-2 which is compiled using Go 1.12.9
// Made available in v2.2.8 and v2.3.0 due to older rke-tools version
"v1.13.10-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.10-rancher1"),
- Alpine: m("rancher/rke-tools:v0.1.16-1"),
- NginxProxy: m("rancher/rke-tools:v0.1.16-1"),
- CertDownloader: m("rancher/rke-tools:v0.1.16-1"),
- KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-1"),
+ Alpine: m("rancher/rke-tools:v0.1.16-2"),
+ NginxProxy: m("rancher/rke-tools:v0.1.16-2"),
+ CertDownloader: m("rancher/rke-tools:v0.1.16-2"),
+ KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-2"),
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"),
diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go
index 26cb07b5..bd59b8f8 100644
--- a/apis/management.cattle.io/v3/k8s_windows_default.go
+++ b/apis/management.cattle.io/v3/k8s_windows_default.go
@@ -299,6 +299,14 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
+ "v1.12.7-rancher1-4": {
+ NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
+ KubernetesBinaries: m("rancher/hyperkube:v1.12.7-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.13.1-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"),