Skip to content

Commit

Permalink
Merge pull request #1492 from chiukapoor/v2.10-aug-patches
Browse files Browse the repository at this point in the history 
[v2.10][Forwardport] RKE K8s Aug 2024 patches
  • Loading branch information
@kinarashah
kinarashah authored Sep 25, 2024
2 parents 21862cb + f6a9162 commit 8526608
Show file tree
Hide file tree
Showing 13 changed files with 24,699 additions and 29 deletions.
182 changes: 168 additions & 14 deletions data/data.json
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkg/rke/k8s_docker_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ func loadK8sVersionDockerInfo() map[string][]string {
"1.24": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x"},
"1.25": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x"},
"1.26": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x"},
"1.27": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x"},
"1.28": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x"},
"1.29": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x"},
"1.30": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x"},
"1.27": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
"1.28": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
"1.29": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
"1.30": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
}
}
124 changes: 124 additions & 0 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10646,6 +10646,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.2
"v1.28.13-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.10",
Kubernetes: "rancher/hyperkube:v1.28.13-rancher1",
Alpine: "rancher/rke-tools:v0.1.102",
NginxProxy: "rancher/rke-tools:v0.1.102",
CertDownloader: "rancher/rke-tools:v0.1.102",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.102",
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.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.24.2",
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.0.4.3.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.3.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.3.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.3.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.3.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.3.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.11.2-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.6-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.12",
Expand Down Expand Up @@ -10730,6 +10772,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.2
"v1.29.8-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.12",
Kubernetes: "rancher/hyperkube:v1.29.8-rancher1",
Alpine: "rancher/rke-tools:v0.1.102",
NginxProxy: "rancher/rke-tools:v0.1.102",
CertDownloader: "rancher/rke-tools:v0.1.102",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.102",
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.0.4.3.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.3.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.3.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.3.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.3.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.3.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.11.2-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 @@ -10810,6 +10894,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.2
"v1.30.4-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.12",
Kubernetes: "rancher/hyperkube:v1.30.4-rancher1",
Alpine: "rancher/rke-tools:v0.1.102",
NginxProxy: "rancher/rke-tools:v0.1.102",
CertDownloader: "rancher/rke-tools:v0.1.102",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.102",
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.0.4.3.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.3.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.3.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.3.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.3.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.3.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.11.2-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",
},
// 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.30.3-rancher1-1",
"default": "v1.30.4-rancher1-1",
}
}

Expand Down
Loading

0 comments on commit 8526608

Please sign in to comment.