diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index ab8f5cfa..6c8b8f44 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -972,6 +972,34 @@ var ( CoreDNS: m("coredns/coredns:1.2.2"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, + "v1.12.7-rancher1-3": { + Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.28"), + NginxProxy: m("rancher/rke-tools:v0.1.28"), + CertDownloader: m("rancher/rke-tools:v0.1.28"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.14.13"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.14.13"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), + 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:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), + MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), + CoreDNS: m("coredns/coredns:1.2.2"), + CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + }, "v1.13.1-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"), @@ -1085,6 +1113,34 @@ var ( CoreDNS: m("coredns/coredns:1.2.6"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, + "v1.13.5-rancher1-3": { + Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.13.5-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.28"), + NginxProxy: m("rancher/rke-tools:v0.1.28"), + CertDownloader: m("rancher/rke-tools:v0.1.28"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), + CalicoNode: m("quay.io/calico/node:v3.4.0"), + CalicoCNI: m("quay.io/calico/cni:v3.4.0"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.4.0"), + CanalCNI: m("quay.io/calico/cni:v3.4.0"), + 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:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), + MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), + CoreDNS: m("coredns/coredns:1.2.6"), + CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), + }, // Enabled in Rancher v2.2.2 "v1.14.1-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), @@ -1142,6 +1198,34 @@ var ( CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, + "v1.14.1-rancher1-2b": { + Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.14.1-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.28"), + NginxProxy: m("rancher/rke-tools:v0.1.28"), + CertDownloader: m("rancher/rke-tools:v0.1.28"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.28"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), + CalicoNode: m("quay.io/calico/node:v3.4.0"), + CalicoCNI: m("quay.io/calico/cni:v3.4.0"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.4.0"), + CanalCNI: m("quay.io/calico/cni:v3.4.0"), + 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:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"), + MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), + CoreDNS: m("coredns/coredns:1.3.1"), + CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), + }, // k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters // without all clusters being restarted "v1.12.5-rancher1-1": { diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index d187554c..84d45ccf 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -278,6 +278,12 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.12.7-rancher1-3": { + 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"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.13.1-rancher1-2": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"), @@ -324,6 +330,14 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.13.5-rancher1-3": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-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"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.14.1-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.14.1-nanoserver-1803"), @@ -338,6 +352,12 @@ var ( FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"), KubeletPause: m("rancher/kubelet-pause:v0.1.2"), }, + "v1.14.1-rancher1-2": { + // NginxProxy image is replaced by host running nginx, fixed rancher#16074 + KubernetesBinaries: m("rancher/hyperkube:v1.14.1-rancher2"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"), + KubeletPause: m("rancher/kubelet-pause:v0.1.2"), + }, } )