Skip to content

Commit

Permalink
Merge pull request #1378 from rancher/dev-v2.7-2024-03-patches
Browse files Browse the repository at this point in the history 
[v2.7] KDM release 2024-03-patches
  • Loading branch information
@kinarashah
kinarashah authored Apr 10, 2024
2 parents 1087403 + ed132b2 commit cce09b6
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 2 deletions.
84 changes: 83 additions & 1 deletion data/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12605,6 +12605,47 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.26.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.9.4",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28",
"kubernetes": "rancher/hyperkube:v1.26.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.26.4-rancher2-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.6",
"alpine": "rancher/rke-tools:v0.1.89",
Expand Down Expand Up @@ -12939,6 +12980,47 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.27.12-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.12-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",
Expand Down Expand Up @@ -14027,7 +14109,7 @@
},
"RKEDefaultK8sVersions": {
"0.3": "v1.16.3-rancher1-1",
"default": "v1.27.11-rancher1-1"
"default": "v1.27.12-rancher1-1"
},
"K8sVersionDockerInfo": {
"1.10": [
Expand Down
84 changes: 84 additions & 0 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9888,6 +9888,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
WindowsPodInfraContainer: "rancher/mirrored-pause:3.7",
Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28",
},
// Enabled out of band post v2.7.12
"v1.26.15-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.10",
Kubernetes: "rancher/hyperkube:v1.26.15-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.9.4",
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 Rancher v2.7.11, originally in v2.8.0
"v1.27.6-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.7",
Expand Down Expand Up @@ -10142,6 +10184,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
WindowsPodInfraContainer: "rancher/mirrored-pause:3.7",
Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28",
},
// Enabled out of band post v2.7.12
"v1.27.12-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.10",
Kubernetes: "rancher/hyperkube:v1.27.12-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",
},
// 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 @@ -61,7 +61,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.27.11-rancher1-1",
"default": "v1.27.12-rancher1-1",
}
}

Expand Down
3 changes: 3 additions & 0 deletions regsync.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,15 @@ sync:
- v1.26.11-rancher2
- v1.26.13-rancher1
- v1.26.14-rancher1
- v1.26.15-rancher1
- v1.26.4-rancher2
- v1.26.6-rancher1
- v1.26.7-rancher1
- v1.26.8-rancher1
- v1.26.9-rancher1
- v1.27.10-rancher1
- v1.27.11-rancher1
- v1.27.12-rancher1
- v1.27.6-rancher1
- v1.27.8-rancher2
- source: docker.io/rancher/k3s-upgrade
Expand Down Expand Up @@ -741,6 +743,7 @@ sync:
allow:
- 1.8.5
- 1.8.6
- v1.8.9
- source: docker.io/rancher/mirrored-coredns-coredns
target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-coredns-coredns'
type: repository
Expand Down

0 comments on commit cce09b6

Please sign in to comment.