Merge pull request #1435 from vardhaman22/2.9-bump-rke-tools

[dev v2.9] bump rke tools for june patches
rancher · Jul 9, 2024 · d454506 · d454506
2 parents 6ac3886 + 2b02cad
commit d454506
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/data/data.json b/data/data.json
@@ -13288,10 +13288,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",
@@ -13495,10 +13495,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",
@@ -13659,10 +13659,10 @@
   },
   "v1.29.6-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
-   "alpine": "rancher/rke-tools:v0.1.97",
-   "nginxProxy": "rancher/rke-tools:v0.1.97",
-   "certDownloader": "rancher/rke-tools:v0.1.97",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.97",
+   "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",
@@ -13700,10 +13700,10 @@
   },
   "v1.30.2-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
-   "alpine": "rancher/rke-tools:v0.1.99",
-   "nginxProxy": "rancher/rke-tools:v0.1.99",
-   "certDownloader": "rancher/rke-tools:v0.1.99",
-   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.99",
+   "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.23.0",
    "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.23.0",
    "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.23.0",

diff --git 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",
@@ -10566,10 +10566,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 		"v1.29.6-rancher1-1": {
 			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.12",
 			Kubernetes:                "rancher/hyperkube:v1.29.6-rancher1",
-			Alpine:                    "rancher/rke-tools:v0.1.97",
-			NginxProxy:                "rancher/rke-tools:v0.1.97",
-			CertDownloader:            "rancher/rke-tools:v0.1.97",
-			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.97",
+			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",
@@ -10608,10 +10608,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 		"v1.30.2-rancher1-1": {
 			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.12",
 			Kubernetes:                "rancher/hyperkube:v1.30.2-rancher1",
-			Alpine:                    "rancher/rke-tools:v0.1.99",
-			NginxProxy:                "rancher/rke-tools:v0.1.99",
-			CertDownloader:            "rancher/rke-tools:v0.1.99",
-			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.99",
+			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.23.0",
 			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.23.0",
 			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.23.0",

diff --git a/regsync.yaml b/regsync.yaml
@@ -1115,14 +1115,13 @@ sync:
     type: repository
     tags:
       allow:
+        - v0.1.100
         - v0.1.80
         - v0.1.87
         - v0.1.88
         - v0.1.89
         - v0.1.90
         - v0.1.96
-        - v0.1.97
-        - v0.1.99
   - source: docker.io/rancher/rke2-cloud-provider
     target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/rke2-cloud-provider'
     type: repository