From de618cdbee163529eff00a06330e7953a15ebc0c Mon Sep 17 00:00:00 2001 From: vardhaman22 Date: Tue, 9 Jul 2024 08:18:52 +0530 Subject: [PATCH 1/2] rke: bumped rke-tools image to v0.1.100 for k8s june 2024 patches --- pkg/rke/k8s_rke_system_images.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index 6b3ae50d6..b8052f23b 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -10314,10 +10314,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { "v1.27.15-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", 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", - KubernetesServicesSidecar: "rancher/rke-tools:v0.1.96", + Alpine: "rancher/rke-tools:v0.1.100", + NginxProxy: "rancher/rke-tools:v0.1.100", + CertDownloader: "rancher/rke-tools:v0.1.100", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.100", 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", @@ -10524,10 +10524,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { "v1.28.11-rancher1-1": { Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", 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", - KubernetesServicesSidecar: "rancher/rke-tools:v0.1.96", + Alpine: "rancher/rke-tools:v0.1.100", + NginxProxy: "rancher/rke-tools:v0.1.100", + CertDownloader: "rancher/rke-tools:v0.1.100", + KubernetesServicesSidecar: "rancher/rke-tools:v0.1.100", 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", From 8f87b69adbe86b247fd3a230be2959815215bcf7 Mon Sep 17 00:00:00 2001 From: vardhaman22 Date: Tue, 9 Jul 2024 08:23:52 +0530 Subject: [PATCH 2/2] go generate --- data/data.json | 16 ++++++++-------- regsync.yaml | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/data.json b/data/data.json index 57ec7a5c7..1b50d1e58 100644 --- a/data/data.json +++ b/data/data.json @@ -13166,10 +13166,10 @@ }, "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", + "alpine": "rancher/rke-tools:v0.1.100", + "nginxProxy": "rancher/rke-tools:v0.1.100", + "certDownloader": "rancher/rke-tools:v0.1.100", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.100", "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", @@ -13373,10 +13373,10 @@ }, "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", + "alpine": "rancher/rke-tools:v0.1.100", + "nginxProxy": "rancher/rke-tools:v0.1.100", + "certDownloader": "rancher/rke-tools:v0.1.100", + "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.100", "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", diff --git a/regsync.yaml b/regsync.yaml index 86831bde2..d83dfb123 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -1084,6 +1084,7 @@ sync: type: repository tags: allow: + - v0.1.100 - v0.1.80 - v0.1.87 - v0.1.88