diff --git a/data/data.json b/data/data.json index 5195ac338..9ecabdc55 100644 --- a/data/data.json +++ b/data/data.json @@ -8361,6 +8361,49 @@ "aciGbpServerContainer": "noiro/gbp-server:5.1.1.0.1ae238a", "aciOpflexServerContainer": "noiro/opflex-server:5.1.1.0.1ae238a" }, + "v1.19.16-rancher2-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", + "alpine": "rancher/rke-tools:v0.1.78", + "nginxProxy": "rancher/rke-tools:v0.1.78", + "certDownloader": "rancher/rke-tools:v0.1.78", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.78", + "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.15.10", + "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.15.10", + "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.15.10", + "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + "coredns": "rancher/mirrored-coredns-coredns:1.7.0", + "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.15.13", + "kubernetes": "rancher/hyperkube:v1.19.16-rancher2", + "flannel": "rancher/mirrored-coreos-flannel:v0.15.1", + "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6", + "calicoNode": "rancher/mirrored-calico-node:v3.16.5", + "calicoCni": "rancher/mirrored-calico-cni:v3.16.5", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.16.5", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.16.5", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.16.5", + "canalNode": "rancher/mirrored-calico-node:v3.16.5", + "canalCni": "rancher/mirrored-calico-cni:v3.16.5", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.16.5", + "canalFlannel": "rancher/mirrored-coreos-flannel:v0.15.1", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.16.5", + "weaveNode": "weaveworks/weave-kube:2.7.0", + "weaveCni": "weaveworks/weave-npc:2.7.0", + "podInfraContainer": "rancher/mirrored-pause:3.2", + "ingress": "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1", + "metricsServer": "rancher/mirrored-metrics-server:v0.3.6", + "windowsPodInfraContainer": "rancher/kubelet-pause:v0.1.6", + "aciCniDeployContainer": "noiro/cnideploy:5.1.1.0.1ae238a", + "aciHostContainer": "noiro/aci-containers-host:5.1.1.0.1ae238a", + "aciOpflexContainer": "noiro/opflex:5.1.1.0.1ae238a", + "aciMcastContainer": "noiro/opflex:5.1.1.0.1ae238a", + "aciOvsContainer": "noiro/openvswitch:5.1.1.0.1ae238a", + "aciControllerContainer": "noiro/aci-containers-controller:5.1.1.0.1ae238a", + "aciGbpServerContainer": "noiro/gbp-server:5.1.1.0.1ae238a", + "aciOpflexServerContainer": "noiro/opflex-server:5.1.1.0.1ae238a" + }, "v1.19.2-rancher1-1": { "etcd": "rancher/coreos-etcd:v3.4.13-rancher1", "alpine": "rancher/rke-tools:v0.1.65", @@ -11488,6 +11531,10 @@ "minRKEVersion": "1.2.14-rc0", "minRancherVersion": "2.5.11-rc0" }, + "v1.19.16-rancher2-1": { + "minRKEVersion": "1.2.14-rc0", + "minRancherVersion": "2.5.11-rc0" + }, "v1.20": { "minRKEVersion": "1.2.0-rc0", "minRancherVersion": "2.5.6-rc0" diff --git a/rke/k8s_rke_system_images.go b/rke/k8s_rke_system_images.go index e209de8e1..cc126ae93 100644 --- a/rke/k8s_rke_system_images.go +++ b/rke/k8s_rke_system_images.go @@ -5827,6 +5827,50 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/kubelet-pause:v0.1.6", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.15.13", }, + // Enabled out of band post v2.6.8 + "v1.19.16-rancher2-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", + Kubernetes: "rancher/hyperkube:v1.19.16-rancher2", + Alpine: "rancher/rke-tools:v0.1.78", + NginxProxy: "rancher/rke-tools:v0.1.78", + CertDownloader: "rancher/rke-tools:v0.1.78", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.78", + KubeDNS: "rancher/mirrored-k8s-dns-kube-dns:1.15.10", + DNSmasq: "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.15.10", + KubeDNSSidecar: "rancher/mirrored-k8s-dns-sidecar:1.15.10", + KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + Flannel: "rancher/mirrored-coreos-flannel:v0.15.1", + FlannelCNI: "rancher/flannel-cni:v0.3.0-rancher6", + CalicoNode: "rancher/mirrored-calico-node:v3.16.5", + CalicoCNI: "rancher/mirrored-calico-cni:v3.16.5", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.16.5", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.16.5", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.16.5", + CanalNode: "rancher/mirrored-calico-node:v3.16.5", + CanalCNI: "rancher/mirrored-calico-cni:v3.16.5", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.16.5", + CanalFlannel: "rancher/mirrored-coreos-flannel:v0.15.1", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.16.5", + WeaveNode: "weaveworks/weave-kube:2.7.0", + WeaveCNI: "weaveworks/weave-npc:2.7.0", + AciCniDeployContainer: "noiro/cnideploy:5.1.1.0.1ae238a", + AciHostContainer: "noiro/aci-containers-host:5.1.1.0.1ae238a", + AciOpflexContainer: "noiro/opflex:5.1.1.0.1ae238a", + AciMcastContainer: "noiro/opflex:5.1.1.0.1ae238a", + AciOpenvSwitchContainer: "noiro/openvswitch:5.1.1.0.1ae238a", + AciControllerContainer: "noiro/aci-containers-controller:5.1.1.0.1ae238a", + AciGbpServerContainer: "noiro/gbp-server:5.1.1.0.1ae238a", + AciOpflexServerContainer: "noiro/opflex-server:5.1.1.0.1ae238a", + PodInfraContainer: "rancher/mirrored-pause:3.2", + Ingress: "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1", + MetricsServer: "rancher/mirrored-metrics-server:v0.3.6", + CoreDNS: "rancher/mirrored-coredns-coredns:1.7.0", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + WindowsPodInfraContainer: "rancher/kubelet-pause:v0.1.6", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.15.13", + }, // Enabled in v2.5.6 // Reminder: This template contains ACI images which aren't in templates for v2.4.x "v1.20.4-rancher1-1": { diff --git a/rke/k8s_version_info.go b/rke/k8s_version_info.go index b1e362c1b..633cdf410 100644 --- a/rke/k8s_version_info.go +++ b/rke/k8s_version_info.go @@ -549,6 +549,10 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo { MinRancherVersion: "2.5.11-rc0", MinRKEVersion: "1.2.14-rc0", }, + "v1.19.16-rancher2-1": { + MinRancherVersion: "2.5.11-rc0", + MinRKEVersion: "1.2.14-rc0", + }, "v1.20": { MinRancherVersion: "2.5.6-rc0", MinRKEVersion: "1.2.0-rc0",