Merge pull request rancher#1561 from chiukapoor/v2.10-downgrade-rke-t…

…ools
noironetworks · Dec 3, 2024 · 3bb9be1 · 3bb9be1
2 parents 188390f + 449b1fc
commit 3bb9be1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/data/data.json b/data/data.json
@@ -13966,10 +13966,10 @@
   },
   "v1.29.11-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
-   "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",
+   "alpine": "rancher/rke-tools:v0.1.105",
+   "nginxProxy": "rancher/rke-tools:v0.1.105",
+   "certDownloader": "rancher/rke-tools:v0.1.105",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.105",
    "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",
@@ -14366,10 +14366,10 @@
   },
   "v1.30.7-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
-   "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",
+   "alpine": "rancher/rke-tools:v0.1.105",
+   "nginxProxy": "rancher/rke-tools:v0.1.105",
+   "certDownloader": "rancher/rke-tools:v0.1.105",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.105",
    "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",
@@ -14444,10 +14444,10 @@
   },
   "v1.31.3-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.15",
-   "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",
+   "alpine": "rancher/rke-tools:v0.1.105",
+   "nginxProxy": "rancher/rke-tools:v0.1.105",
+   "certDownloader": "rancher/rke-tools:v0.1.105",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.105",
    "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
@@ -10986,10 +10986,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 		"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",
+			Alpine:                    "rancher/rke-tools:v0.1.105",
+			NginxProxy:                "rancher/rke-tools:v0.1.105",
+			CertDownloader:            "rancher/rke-tools:v0.1.105",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.105",
 			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",
@@ -11228,10 +11228,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 		"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",
+			Alpine:                    "rancher/rke-tools:v0.1.105",
+			NginxProxy:                "rancher/rke-tools:v0.1.105",
+			CertDownloader:            "rancher/rke-tools:v0.1.105",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.105",
 			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",
@@ -11308,10 +11308,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 		"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",
+			Alpine:                    "rancher/rke-tools:v0.1.105",
+			NginxProxy:                "rancher/rke-tools:v0.1.105",
+			CertDownloader:            "rancher/rke-tools:v0.1.105",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.105",
 			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
@@ -1292,7 +1292,6 @@ sync:
         - v0.1.102
         - v0.1.103
         - v0.1.105
-        - v0.1.106
         - v0.1.80
         - v0.1.87
         - v0.1.88