From 6ae23f34edc26452d57113e4bfcceea8fcc3be99 Mon Sep 17 00:00:00 2001 From: Krunal Hingu Date: Fri, 21 Jun 2024 11:12:22 +0530 Subject: [PATCH 1/3] copy previous templates --- pkg/rke/k8s_rke_system_images.go | 84 ++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index ff294f29d..f14fd17d7 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -10310,6 +10310,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, + // Enabled in Rancher v2.9.0 + "v1.27.14-rancher1-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", + Kubernetes: "rancher/hyperkube:v1.27.14-rancher1", + Alpine: "rancher/rke-tools:v0.1.96", + NginxProxy: "rancher/rke-tools:v0.1.96", + CertDownloader: "rancher/rke-tools:v0.1.96", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.96", + KubeDNS: "rancher/mirrored-k8s-dns-kube-dns:1.22.28", + DNSmasq: "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28", + KubeDNSSidecar: "rancher/mirrored-k8s-dns-sidecar:1.22.28", + KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + Flannel: "rancher/mirrored-flannel-flannel:v0.21.4", + FlannelCNI: "rancher/flannel-cni:v0.3.0-rancher8", + CalicoNode: "rancher/mirrored-calico-node:v3.26.3", + CalicoCNI: "rancher/calico-cni:v3.26.3-rancher1", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.26.3", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.26.3", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3", + CanalNode: "rancher/mirrored-calico-node:v3.26.3", + CanalCNI: "rancher/calico-cni:v3.26.3-rancher1", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.26.3", + CanalFlannel: "rancher/mirrored-flannel-flannel:v0.21.4", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3", + WeaveNode: "weaveworks/weave-kube:2.8.1", + WeaveCNI: "weaveworks/weave-npc:2.8.1", + AciCniDeployContainer: "noiro/cnideploy:6.0.4.1.81c2369", + AciHostContainer: "noiro/aci-containers-host:6.0.4.1.81c2369", + AciOpflexContainer: "noiro/opflex:6.0.4.1.81c2369", + AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369", + AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369", + AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369", + PodInfraContainer: "rancher/mirrored-pause:3.7", + Ingress: "rancher/nginx-ingress-controller:nginx-1.9.4-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231011-8b53cabe0", + MetricsServer: "rancher/mirrored-metrics-server:v0.6.3", + CoreDNS: "rancher/mirrored-coredns-coredns:1.10.1", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", + }, // Enabled with Rancher v2.8.3 "v1.28.7-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", @@ -10478,6 +10520,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, + // Enabled in Rancher v2.9.0 + "v1.28.10-rancher1-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", + Kubernetes: "rancher/hyperkube:v1.28.10-rancher1", + Alpine: "rancher/rke-tools:v0.1.96", + NginxProxy: "rancher/rke-tools:v0.1.96", + CertDownloader: "rancher/rke-tools:v0.1.96", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.96", + KubeDNS: "rancher/mirrored-k8s-dns-kube-dns:1.22.28", + DNSmasq: "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28", + KubeDNSSidecar: "rancher/mirrored-k8s-dns-sidecar:1.22.28", + KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + Flannel: "rancher/mirrored-flannel-flannel:v0.24.2", + FlannelCNI: "rancher/flannel-cni:v0.3.0-rancher9", + CalicoNode: "rancher/mirrored-calico-node:v3.27.0", + CalicoCNI: "rancher/calico-cni:v3.27.0-rancher1", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.27.0", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.27.0", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0", + CanalNode: "rancher/mirrored-calico-node:v3.27.0", + CanalCNI: "rancher/calico-cni:v3.27.0-rancher1", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.27.0", + CanalFlannel: "rancher/mirrored-flannel-flannel:v0.24.2", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0", + WeaveNode: "weaveworks/weave-kube:2.8.1", + WeaveCNI: "weaveworks/weave-npc:2.8.1", + AciCniDeployContainer: "noiro/cnideploy:6.0.4.1.81c2369", + AciHostContainer: "noiro/aci-containers-host:6.0.4.1.81c2369", + AciOpflexContainer: "noiro/opflex:6.0.4.1.81c2369", + AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369", + AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369", + AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369", + PodInfraContainer: "rancher/mirrored-pause:3.7", + Ingress: "rancher/nginx-ingress-controller:nginx-1.9.6-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06", + MetricsServer: "rancher/mirrored-metrics-server:v0.7.0", + CoreDNS: "rancher/mirrored-coredns-coredns:1.10.1", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", + }, // Enabled in v2.9.0 "v1.29.5-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", From 623b35439fcc89c7e8830d79836614b3bcf6d582 Mon Sep 17 00:00:00 2001 From: Krunal Hingu Date: Fri, 21 Jun 2024 11:13:56 +0530 Subject: [PATCH 2/3] add support till k8s 1.30.2 --- pkg/rke/k8s_rke_system_images.go | 16 ++++++++-------- pkg/rke/k8s_version_info.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index f14fd17d7..6d5fb4628 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -10311,9 +10311,9 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, // Enabled in Rancher v2.9.0 - "v1.27.14-rancher1-1": { + "v1.27.15-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", - Kubernetes: "rancher/hyperkube:v1.27.14-rancher1", + Kubernetes: "rancher/hyperkube:v1.27.15-rancher1", Alpine: "rancher/rke-tools:v0.1.96", NginxProxy: "rancher/rke-tools:v0.1.96", CertDownloader: "rancher/rke-tools:v0.1.96", @@ -10521,9 +10521,9 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, // Enabled in Rancher v2.9.0 - "v1.28.10-rancher1-1": { + "v1.28.11-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", - Kubernetes: "rancher/hyperkube:v1.28.10-rancher1", + Kubernetes: "rancher/hyperkube:v1.28.11-rancher1", Alpine: "rancher/rke-tools:v0.1.96", NginxProxy: "rancher/rke-tools:v0.1.96", CertDownloader: "rancher/rke-tools:v0.1.96", @@ -10563,9 +10563,9 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, // Enabled in v2.9.0 - "v1.29.5-rancher1-1": { + "v1.29.6-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", - Kubernetes: "rancher/hyperkube:v1.29.5-rancher1", + Kubernetes: "rancher/hyperkube:v1.29.6-rancher1", Alpine: "rancher/rke-tools:v0.1.97", NginxProxy: "rancher/rke-tools:v0.1.97", CertDownloader: "rancher/rke-tools:v0.1.97", @@ -10605,9 +10605,9 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, // Enabled in v2.9.0 - "v1.30.1-rancher1-1": { + "v1.30.2-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", - Kubernetes: "rancher/hyperkube:v1.30.1-rancher1", + Kubernetes: "rancher/hyperkube:v1.30.2-rancher1", Alpine: "rancher/rke-tools:v0.1.99", NginxProxy: "rancher/rke-tools:v0.1.99", CertDownloader: "rancher/rke-tools:v0.1.99", diff --git a/pkg/rke/k8s_version_info.go b/pkg/rke/k8s_version_info.go index a54e28ada..8d08cf287 100644 --- a/pkg/rke/k8s_version_info.go +++ b/pkg/rke/k8s_version_info.go @@ -65,7 +65,7 @@ func loadRKEDefaultK8sVersions() map[string]string { return map[string]string{ "0.3": "v1.16.3-rancher1-1", // rke will use default if its version is absent - "default": "v1.30.1-rancher1-1", + "default": "v1.30.2-rancher1-1", } } From 28051b9c0dbeb0a47b6e32008b9bef9c70ddab33 Mon Sep 17 00:00:00 2001 From: Krunal Hingu Date: Fri, 21 Jun 2024 11:15:11 +0530 Subject: [PATCH 3/3] go generate --- data/data.json | 92 +++++++++++++++++++++++++++++++++++++++++++++++--- regsync.yaml | 6 ++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/data/data.json b/data/data.json index 036d65cc9..e8a918b5d 100644 --- a/data/data.json +++ b/data/data.json @@ -13286,6 +13286,47 @@ "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" }, + "v1.27.15-rancher1-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.5.10", + "alpine": "rancher/rke-tools:v0.1.96", + "nginxProxy": "rancher/rke-tools:v0.1.96", + "certDownloader": "rancher/rke-tools:v0.1.96", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.96", + "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.28", + "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28", + "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.28", + "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + "coredns": "rancher/mirrored-coredns-coredns:1.10.1", + "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28", + "kubernetes": "rancher/hyperkube:v1.27.15-rancher1", + "flannel": "rancher/mirrored-flannel-flannel:v0.21.4", + "flannelCni": "rancher/flannel-cni:v0.3.0-rancher8", + "calicoNode": "rancher/mirrored-calico-node:v3.26.3", + "calicoCni": "rancher/calico-cni:v3.26.3-rancher1", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.26.3", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.26.3", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3", + "canalNode": "rancher/mirrored-calico-node:v3.26.3", + "canalCni": "rancher/calico-cni:v3.26.3-rancher1", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.26.3", + "canalFlannel": "rancher/mirrored-flannel-flannel:v0.21.4", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3", + "weaveNode": "weaveworks/weave-kube:2.8.1", + "weaveCni": "weaveworks/weave-npc:2.8.1", + "podInfraContainer": "rancher/mirrored-pause:3.7", + "ingress": "rancher/nginx-ingress-controller:nginx-1.9.4-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231011-8b53cabe0", + "metricsServer": "rancher/mirrored-metrics-server:v0.6.3", + "windowsPodInfraContainer": "rancher/mirrored-pause:3.7", + "aciCniDeployContainer": "noiro/cnideploy:6.0.4.1.81c2369", + "aciHostContainer": "noiro/aci-containers-host:6.0.4.1.81c2369", + "aciOpflexContainer": "noiro/opflex:6.0.4.1.81c2369", + "aciMcastContainer": "noiro/opflex:6.0.4.1.81c2369", + "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", + "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" + }, "v1.27.6-rancher1-1": { "etcd": "rancher/mirrored-coreos-etcd:v3.5.7", "alpine": "rancher/rke-tools:v0.1.96", @@ -13452,6 +13493,47 @@ "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" }, + "v1.28.11-rancher1-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.5.10", + "alpine": "rancher/rke-tools:v0.1.96", + "nginxProxy": "rancher/rke-tools:v0.1.96", + "certDownloader": "rancher/rke-tools:v0.1.96", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.96", + "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.28", + "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28", + "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.28", + "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + "coredns": "rancher/mirrored-coredns-coredns:1.10.1", + "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28", + "kubernetes": "rancher/hyperkube:v1.28.11-rancher1", + "flannel": "rancher/mirrored-flannel-flannel:v0.24.2", + "flannelCni": "rancher/flannel-cni:v0.3.0-rancher9", + "calicoNode": "rancher/mirrored-calico-node:v3.27.0", + "calicoCni": "rancher/calico-cni:v3.27.0-rancher1", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.27.0", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.27.0", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0", + "canalNode": "rancher/mirrored-calico-node:v3.27.0", + "canalCni": "rancher/calico-cni:v3.27.0-rancher1", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.27.0", + "canalFlannel": "rancher/mirrored-flannel-flannel:v0.24.2", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0", + "weaveNode": "weaveworks/weave-kube:2.8.1", + "weaveCni": "weaveworks/weave-npc:2.8.1", + "podInfraContainer": "rancher/mirrored-pause:3.7", + "ingress": "rancher/nginx-ingress-controller:nginx-1.9.6-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06", + "metricsServer": "rancher/mirrored-metrics-server:v0.7.0", + "windowsPodInfraContainer": "rancher/mirrored-pause:3.7", + "aciCniDeployContainer": "noiro/cnideploy:6.0.4.1.81c2369", + "aciHostContainer": "noiro/aci-containers-host:6.0.4.1.81c2369", + "aciOpflexContainer": "noiro/opflex:6.0.4.1.81c2369", + "aciMcastContainer": "noiro/opflex:6.0.4.1.81c2369", + "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", + "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" + }, "v1.28.7-rancher1-1": { "etcd": "rancher/mirrored-coreos-etcd:v3.5.10", "alpine": "rancher/rke-tools:v0.1.96", @@ -13575,7 +13657,7 @@ "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" }, - "v1.29.5-rancher1-1": { + "v1.29.6-rancher1-1": { "etcd": "rancher/mirrored-coreos-etcd:v3.5.12", "alpine": "rancher/rke-tools:v0.1.97", "nginxProxy": "rancher/rke-tools:v0.1.97", @@ -13588,7 +13670,7 @@ "coredns": "rancher/mirrored-coredns-coredns:1.11.1", "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28", - "kubernetes": "rancher/hyperkube:v1.29.5-rancher1", + "kubernetes": "rancher/hyperkube:v1.29.6-rancher1", "flannel": "rancher/mirrored-flannel-flannel:v0.25.1", "flannelCni": "rancher/flannel-cni:v1.4.1-rancher1", "calicoNode": "rancher/mirrored-calico-node:v3.27.3", @@ -13616,7 +13698,7 @@ "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" }, - "v1.30.1-rancher1-1": { + "v1.30.2-rancher1-1": { "etcd": "rancher/mirrored-coreos-etcd:v3.5.12", "alpine": "rancher/rke-tools:v0.1.99", "nginxProxy": "rancher/rke-tools:v0.1.99", @@ -13629,7 +13711,7 @@ "coredns": "rancher/mirrored-coredns-coredns:1.11.1", "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.23.0", - "kubernetes": "rancher/hyperkube:v1.30.1-rancher1", + "kubernetes": "rancher/hyperkube:v1.30.2-rancher1", "flannel": "rancher/mirrored-flannel-flannel:v0.25.1", "flannelCni": "rancher/flannel-cni:v1.4.1-rancher1", "calicoNode": "rancher/mirrored-calico-node:v3.28.0", @@ -14666,7 +14748,7 @@ }, "RKEDefaultK8sVersions": { "0.3": "v1.16.3-rancher1-1", - "default": "v1.30.1-rancher1-1" + "default": "v1.30.2-rancher1-1" }, "K8sVersionDockerInfo": { "1.10": [ diff --git a/regsync.yaml b/regsync.yaml index 6e848b13f..c3b5bb032 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -347,14 +347,16 @@ sync: - v1.27.12-rancher1 - v1.27.13-rancher1 - v1.27.14-rancher1 + - v1.27.15-rancher1 - v1.27.6-rancher1 - v1.27.8-rancher2 - v1.28.10-rancher1 + - v1.28.11-rancher1 - v1.28.7-rancher1 - v1.28.8-rancher1 - v1.28.9-rancher1 - - v1.29.5-rancher1 - - v1.30.1-rancher1 + - v1.29.6-rancher1 + - v1.30.2-rancher1 - source: docker.io/rancher/k3s-upgrade target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/k3s-upgrade' type: repository