diff --git a/data/data.json b/data/data.json index a6435fcd9..193284469 100644 --- a/data/data.json +++ b/data/data.json @@ -13985,6 +13985,47 @@ "aciOvsContainer": "noiro/openvswitch:6.1.1.2.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.1.1.2.81c2369" }, + "v1.29.13-rancher1-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.5.12", + "alpine": "rancher/rke-tools:v0.1.108", + "nginxProxy": "rancher/rke-tools:v0.1.108", + "certDownloader": "rancher/rke-tools:v0.1.108", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.108", + "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.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.13-rancher1", + "flannel": "rancher/mirrored-flannel-flannel:v0.25.1", + "flannelCni": "rancher/flannel-cni:v1.4.1-rancher1", + "calicoNode": "rancher/mirrored-calico-node:v3.27.4", + "calicoCni": "rancher/calico-cni:v3.27.4-rancher1", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.27.4", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.27.4", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4", + "canalNode": "rancher/mirrored-calico-node:v3.27.4", + "canalCni": "rancher/calico-cni:v3.27.4-rancher1", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.27.4", + "canalFlannel": "rancher/mirrored-flannel-flannel:v0.25.1", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4", + "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.11.3-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", + "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.1.1.2.81c2369", + "aciHostContainer": "noiro/aci-containers-host:6.1.1.2.81c2369", + "aciOpflexContainer": "noiro/opflex:6.1.1.2.81c2369", + "aciMcastContainer": "noiro/opflex:6.1.1.2.81c2369", + "aciOvsContainer": "noiro/openvswitch:6.1.1.2.81c2369", + "aciControllerContainer": "noiro/aci-containers-controller:6.1.1.2.81c2369" + }, "v1.29.6-rancher1-1": { "etcd": "rancher/mirrored-coreos-etcd:v3.5.12", "alpine": "rancher/rke-tools:v0.1.100", @@ -14422,6 +14463,45 @@ "aciOvsContainer": "noiro/openvswitch:6.1.1.2.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.1.1.2.81c2369" }, + "v1.30.9-rancher1-1": { + "etcd": "rancher/mirrored-coreos-etcd:v3.5.12", + "alpine": "rancher/rke-tools:v0.1.108", + "nginxProxy": "rancher/rke-tools:v0.1.108", + "certDownloader": "rancher/rke-tools:v0.1.108", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.108", + "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.23.0", + "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.23.0", + "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.23.0", + "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + "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.9-rancher1", + "flannel": "rancher/mirrored-flannel-flannel:v0.25.1", + "flannelCni": "rancher/flannel-cni:v1.4.1-rancher1", + "calicoNode": "rancher/mirrored-calico-node:v3.28.1", + "calicoCni": "rancher/calico-cni:v3.28.1-rancher1", + "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.28.1", + "calicoCtl": "rancher/mirrored-calico-ctl:v3.28.1", + "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1", + "canalNode": "rancher/mirrored-calico-node:v3.28.1", + "canalCni": "rancher/calico-cni:v3.28.1-rancher1", + "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.28.1", + "canalFlannel": "rancher/mirrored-flannel-flannel:v0.25.1", + "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1", + "podInfraContainer": "rancher/mirrored-pause:3.7", + "ingress": "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", + "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1", + "metricsServer": "rancher/mirrored-metrics-server:v0.7.1", + "windowsPodInfraContainer": "rancher/mirrored-pause:3.7", + "aciCniDeployContainer": "noiro/cnideploy:6.1.1.2.81c2369", + "aciHostContainer": "noiro/aci-containers-host:6.1.1.2.81c2369", + "aciOpflexContainer": "noiro/opflex:6.1.1.2.81c2369", + "aciMcastContainer": "noiro/opflex:6.1.1.2.81c2369", + "aciOvsContainer": "noiro/openvswitch:6.1.1.2.81c2369", + "aciControllerContainer": "noiro/aci-containers-controller:6.1.1.2.81c2369" + }, "v1.8.11-rancher2-1": { "etcd": "rancher/coreos-etcd:v3.0.17", "alpine": "rancher/rke-tools:v0.1.8", @@ -15478,7 +15558,7 @@ }, "RKEDefaultK8sVersions": { "0.3": "v1.16.3-rancher1-1", - "default": "v1.30.8-rancher1-1" + "default": "v1.30.9-rancher1-1" }, "K8sVersionDockerInfo": { "1.10": [ diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index 44e417d63..5d78d7ad9 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -11066,6 +11066,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.7 + "v1.29.13-rancher1-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", + Kubernetes: "rancher/hyperkube:v1.29.13-rancher1", + Alpine: "rancher/rke-tools:v0.1.108", + NginxProxy: "rancher/rke-tools:v0.1.108", + CertDownloader: "rancher/rke-tools:v0.1.108", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.108", + 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.25.1", + FlannelCNI: "rancher/flannel-cni:v1.4.1-rancher1", + CalicoNode: "rancher/mirrored-calico-node:v3.27.4", + CalicoCNI: "rancher/calico-cni:v3.27.4-rancher1", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.27.4", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.27.4", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4", + CanalNode: "rancher/mirrored-calico-node:v3.27.4", + CanalCNI: "rancher/calico-cni:v3.27.4-rancher1", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.27.4", + CanalFlannel: "rancher/mirrored-flannel-flannel:v0.25.1", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4", + WeaveNode: "weaveworks/weave-kube:2.8.1", + WeaveCNI: "weaveworks/weave-npc:2.8.1", + AciCniDeployContainer: "noiro/cnideploy:6.1.1.2.81c2369", + AciHostContainer: "noiro/aci-containers-host:6.1.1.2.81c2369", + AciOpflexContainer: "noiro/opflex:6.1.1.2.81c2369", + AciMcastContainer: "noiro/opflex:6.1.1.2.81c2369", + AciOpenvSwitchContainer: "noiro/openvswitch:6.1.1.2.81c2369", + AciControllerContainer: "noiro/aci-containers-controller:6.1.1.2.81c2369", + PodInfraContainer: "rancher/mirrored-pause:3.7", + Ingress: "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", + IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06", + MetricsServer: "rancher/mirrored-metrics-server:v0.7.0", + CoreDNS: "rancher/mirrored-coredns-coredns:1.11.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.30.2-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", @@ -11346,6 +11388,46 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.23.0", }, + // Enabled in Rancher v2.9.7 + "v1.30.9-rancher1-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.5.12", + Kubernetes: "rancher/hyperkube:v1.30.9-rancher1", + Alpine: "rancher/rke-tools:v0.1.108", + NginxProxy: "rancher/rke-tools:v0.1.108", + CertDownloader: "rancher/rke-tools:v0.1.108", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.108", + KubeDNS: "rancher/mirrored-k8s-dns-kube-dns:1.23.0", + DNSmasq: "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.23.0", + KubeDNSSidecar: "rancher/mirrored-k8s-dns-sidecar:1.23.0", + KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + Flannel: "rancher/mirrored-flannel-flannel:v0.25.1", + FlannelCNI: "rancher/flannel-cni:v1.4.1-rancher1", + CalicoNode: "rancher/mirrored-calico-node:v3.28.1", + CalicoCNI: "rancher/calico-cni:v3.28.1-rancher1", + CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.28.1", + CalicoCtl: "rancher/mirrored-calico-ctl:v3.28.1", + CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1", + CanalNode: "rancher/mirrored-calico-node:v3.28.1", + CanalCNI: "rancher/calico-cni:v3.28.1-rancher1", + CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.28.1", + CanalFlannel: "rancher/mirrored-flannel-flannel:v0.25.1", + CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1", + AciCniDeployContainer: "noiro/cnideploy:6.1.1.2.81c2369", + AciHostContainer: "noiro/aci-containers-host:6.1.1.2.81c2369", + AciOpflexContainer: "noiro/opflex:6.1.1.2.81c2369", + AciMcastContainer: "noiro/opflex:6.1.1.2.81c2369", + AciOpenvSwitchContainer: "noiro/openvswitch:6.1.1.2.81c2369", + AciControllerContainer: "noiro/aci-containers-controller:6.1.1.2.81c2369", + PodInfraContainer: "rancher/mirrored-pause:3.7", + Ingress: "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", + IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1", + MetricsServer: "rancher/mirrored-metrics-server:v0.7.1", + CoreDNS: "rancher/mirrored-coredns-coredns:1.11.1", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.23.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.11.9-rancher1-3": { diff --git a/pkg/rke/k8s_version_info.go b/pkg/rke/k8s_version_info.go index a62d6b2f1..fd6079c7a 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.8-rancher1-1", + "default": "v1.30.9-rancher1-1", } } diff --git a/regsync.yaml b/regsync.yaml index f8ec9c6f2..d5fbf9eda 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -446,6 +446,7 @@ sync: - v1.29.10-rancher1 - v1.29.11-rancher1 - v1.29.12-rancher1 + - v1.29.13-rancher1 - v1.29.6-rancher1 - v1.29.7-rancher1 - v1.29.8-rancher1 @@ -457,6 +458,7 @@ sync: - v1.30.6-rancher1 - v1.30.7-rancher1 - v1.30.8-rancher1 + - v1.30.9-rancher1 - source: docker.io/rancher/k3s-upgrade target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/k3s-upgrade' type: repository