From 37edc8b8708fe774bed5b2b18e6ce52143ace4cf Mon Sep 17 00:00:00 2001 From: Kinara Shah Date: Tue, 16 Aug 2022 15:27:21 -0700 Subject: [PATCH] v1.20.15-rancher2-2 for v2.6 v1.20.15-rancher2-1 copy for v2.5 + v1.20.15-rancher2-2 for v2.6 changes + go generate --- data/data.json | 51 ++++++++++++++++++++++++++++++++++-- rke/k8s_rke_system_images.go | 46 +++++++++++++++++++++++++++++++- rke/k8s_version_info.go | 4 +++ rke/templates/templates.go | 8 +++--- 4 files changed, 102 insertions(+), 7 deletions(-) diff --git a/data/data.json b/data/data.json index 489c57a75..9907609c6 100644 --- a/data/data.json +++ b/data/data.json @@ -9223,6 +9223,49 @@ "aciOpflexServerContainer": "noiro/opflex-server:5.1.1.0.1ae238a" }, "v1.20.15-rancher2-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", + "alpine": "rancher/rke-tools:v0.1.80", + "nginxProxy": "rancher/rke-tools:v0.1.80", + "certDownloader": "rancher/rke-tools:v0.1.80", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.80", + "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.8.0", + "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.15.13", + "kubernetes": "rancher/hyperkube:v1.20.15-rancher2", + "flannel": "rancher/mirrored-coreos-flannel:v0.15.1", + "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6", + "calicoNode": "rancher/mirrored-calico-node:v3.17.2", + "calicoCni": "rancher/mirrored-calico-cni:v3.17.2", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.17.2", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.17.2", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2", + "canalNode": "rancher/mirrored-calico-node:v3.17.2", + "canalCni": "rancher/mirrored-calico-cni:v3.17.2", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.17.2", + "canalFlannel": "rancher/mirrored-coreos-flannel:v0.15.1", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2", + "weaveNode": "weaveworks/weave-kube:2.8.1", + "weaveCni": "weaveworks/weave-npc:2.8.1", + "podInfraContainer": "rancher/mirrored-pause:3.6", + "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.5.0", + "windowsPodInfraContainer": "rancher/mirrored-pause:3.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.20.15-rancher2-2": { "etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", "alpine": "rancher/rke-tools:v0.1.87", "nginxProxy": "rancher/rke-tools:v0.1.87", @@ -10783,8 +10826,8 @@ }, "K8sVersionedTemplates": { "aci": { - "\u003e=1.17.0-alpha \u003c1.20.15-rancher2-1": "aci-v5.0.0", - "\u003e=1.20.15-rancher2-1 \u003c1.21.0-rancher0": "aci-v5.2.3", + "\u003e=1.17.0-alpha \u003c1.20.15-rancher2-2": "aci-v5.0.0", + "\u003e=1.20.15-rancher2-2 \u003c1.21.0-rancher0": "aci-v5.2.3", "\u003e=1.21.0-rancher0 \u003c1.21.14-rancher1-1": "aci-v5.0.0", "\u003e=1.21.14-rancher1-1 \u003c1.22.0-rancher0": "aci-v5.2.3", "\u003e=1.22.0-rancher0 \u003c1.22.11-rancher1-1": "aci-v5.0.0", @@ -11376,6 +11419,10 @@ "minRKEVersion": "1.2.14-rc0", "minRancherVersion": "2.5.11-rc0" }, + "v1.20.15-rancher2-2": { + "minRKEVersion": "1.2.14-rc0", + "minRancherVersion": "2.5.11-rc0" + }, "v1.20.9-rancher1-1": { "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 e51207315..11acd534d 100644 --- a/rke/k8s_rke_system_images.go +++ b/rke/k8s_rke_system_images.go @@ -6614,8 +6614,52 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/mirrored-pause:3.6", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.15.13", }, - // Enabled with v2.6.7 + // Enabled with v2.5.16 "v1.20.15-rancher2-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", + Kubernetes: "rancher/hyperkube:v1.20.15-rancher2", + Alpine: "rancher/rke-tools:v0.1.80", + NginxProxy: "rancher/rke-tools:v0.1.80", + CertDownloader: "rancher/rke-tools:v0.1.80", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.80", + 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.17.2", + CalicoCNI: "rancher/mirrored-calico-cni:v3.17.2", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.17.2", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.17.2", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2", + CanalNode: "rancher/mirrored-calico-node:v3.17.2", + CanalCNI: "rancher/mirrored-calico-cni:v3.17.2", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.17.2", + CanalFlannel: "rancher/mirrored-coreos-flannel:v0.15.1", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2", + WeaveNode: "weaveworks/weave-kube:2.8.1", + WeaveCNI: "weaveworks/weave-npc:2.8.1", + 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.6", + 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.5.0", + CoreDNS: "rancher/mirrored-coredns-coredns:1.8.0", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:1.8.1", + WindowsPodInfraContainer: "rancher/mirrored-pause:3.6", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.15.13", + }, + // Enabled with v2.6.7 + "v1.20.15-rancher2-2": { Etcd: "rancher/mirrored-coreos-etcd:v3.4.15-rancher1", Kubernetes: "rancher/hyperkube:v1.20.15-rancher2", Alpine: "rancher/rke-tools:v0.1.87", diff --git a/rke/k8s_version_info.go b/rke/k8s_version_info.go index 3a081f0ef..3d9facf4d 100644 --- a/rke/k8s_version_info.go +++ b/rke/k8s_version_info.go @@ -612,6 +612,10 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo { MinRancherVersion: "2.5.11-rc0", MinRKEVersion: "1.2.14-rc0", }, + "v1.20.15-rancher2-2": { + MinRancherVersion: "2.5.11-rc0", + MinRKEVersion: "1.2.14-rc0", + }, "v1.21": { MinRancherVersion: "2.6.0-rc0", MinRKEVersion: "1.3.0-rc0", diff --git a/rke/templates/templates.go b/rke/templates/templates.go index d3cc4d003..9bc479bd0 100644 --- a/rke/templates/templates.go +++ b/rke/templates/templates.go @@ -168,14 +168,14 @@ func LoadK8sVersionedTemplates() map[string]map[string]string { ">=1.8.0-rancher0 <1.16.0-alpha": weavev18, }, kdm.Aci: { - ">=1.17.0-alpha <1.20.15-rancher2-1": aciv500, - ">=1.20.15-rancher2-1 <1.21.0-rancher0": aciv523, + ">=1.17.0-alpha <1.20.15-rancher2-2": aciv500, + ">=1.20.15-rancher2-2 <1.21.0-rancher0": aciv523, ">=1.21.0-rancher0 <1.21.14-rancher1-1": aciv500, ">=1.21.14-rancher1-1 <1.22.0-rancher0": aciv523, ">=1.22.0-rancher0 <1.22.11-rancher1-1": aciv500, ">=1.22.11-rancher1-1 <1.23.0-rancher0": aciv523, - ">=1.23.0-rancher0 <1.23.8-rancher1-1": aciv500, - ">=1.23.8-rancher1-1": aciv523, + ">=1.23.0-rancher0 <1.23.8-rancher1-1": aciv500, + ">=1.23.8-rancher1-1": aciv523, }, kdm.NginxIngress: { ">=1.8.0-rancher0 <1.13.10-rancher1-3": nginxIngressv18,