Skip to content

Commit

Permalink
[v2.10] k8s November 2024 Patches (#1557)
Browse files Browse the repository at this point in the history 
add k8s versions v1.29.11, v1.30.7, 1.31.3
  • Loading branch information
@krunalhinguu
krunalhinguu authored Nov 29, 2024
1 parent 5fc6507 commit 188390f
Show file tree
Hide file tree
Showing 7 changed files with 13,333 additions and 6 deletions.
129 changes: 126 additions & 3 deletions data/data.json
View file

Large diffs are not rendered by default.

122 changes: 122 additions & 0 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10982,6 +10982,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.10.1
"v1.29.11-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.12",
Kubernetes: "rancher/hyperkube:v1.29.11-rancher1",
Alpine: "rancher/rke-tools:v0.1.106",
NginxProxy: "rancher/rke-tools:v0.1.106",
CertDownloader: "rancher/rke-tools:v0.1.106",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.106",
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.1.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.1.1.1.81c2369",
AciOpflexContainer: "noiro/opflex:6.1.1.1.81c2369",
AciMcastContainer: "noiro/opflex:6.1.1.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.1.1.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.1.1.1.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-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.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",
Expand Down Expand Up @@ -11182,6 +11224,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.10.1
"v1.30.7-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.12",
Kubernetes: "rancher/hyperkube:v1.30.7-rancher1",
Alpine: "rancher/rke-tools:v0.1.106",
NginxProxy: "rancher/rke-tools:v0.1.106",
CertDownloader: "rancher/rke-tools:v0.1.106",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.106",
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.1.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.1.1.1.81c2369",
AciOpflexContainer: "noiro/opflex:6.1.1.1.81c2369",
AciMcastContainer: "noiro/opflex:6.1.1.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.1.1.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.1.1.1.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-rancher1",
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",
},
// Enabled in Rancher v2.10.0
"v1.31.2-rancher2-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.15",
Expand Down Expand Up @@ -11222,6 +11304,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.10.1
"v1.31.3-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.15",
Kubernetes: "rancher/hyperkube:v1.31.3-rancher1",
Alpine: "rancher/rke-tools:v0.1.106",
NginxProxy: "rancher/rke-tools:v0.1.106",
CertDownloader: "rancher/rke-tools:v0.1.106",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.106",
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.29.0",
CalicoCNI: "rancher/calico-cni:v3.29.0-rancher1",
CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.29.0",
CalicoCtl: "rancher/mirrored-calico-ctl:v3.29.0",
CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.29.0",
CanalNode: "rancher/mirrored-calico-node:v3.29.0",
CanalCNI: "rancher/calico-cni:v3.29.0-rancher1",
CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.29.0",
CanalFlannel: "rancher/mirrored-flannel-flannel:v0.25.1",
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.29.0",
AciCniDeployContainer: "noiro/cnideploy:6.1.1.1.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.1.1.1.81c2369",
AciOpflexContainer: "noiro/opflex:6.1.1.1.81c2369",
AciMcastContainer: "noiro/opflex:6.1.1.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.1.1.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.1.1.1.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-rancher1",
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.3",
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": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rke/k8s_version_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.31.2-rancher2-1",
"default": "v1.31.3-rancher1-1",
}
}

Expand Down
Loading

0 comments on commit 188390f

Please sign in to comment.