feat: bump RKE2 to v1.31.4+rke2r1 and Rancher to v2.10.1 (#926)

* feat: bump RKE2 to v1.31.4+rke2r1 Signed-off-by: PoAn Yang <[email protected]> * feat: bump rancher to v2.10.1 Signed-off-by: PoAn Yang <[email protected]> * feat: add readinessProbe to harvester-cluster-repo Signed-off-by: PoAn Yang <[email protected]> --------- Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit e2cc599)
harvester · Feb 11, 2025 · 5fdca0b · 5fdca0b
1 parent 5dbf8f3
commit 5fdca0b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/package/harvester-os/files/usr/share/rancher/rancherd/config.yaml.d/50-defaults.yaml b/package/harvester-os/files/usr/share/rancher/rancherd/config.yaml.d/50-defaults.yaml
@@ -1,14 +1,14 @@
 rancherValues:
   rancherImagePullPolicy: IfNotPresent
   rancherImage: rancher/rancher
-  rancherImageTag: v2.9.3
+  rancherImageTag: v2.10.1
   noDefaultAdmin: false
-  features: multi-cluster-management=false,multi-cluster-management-agent=false
+  features: multi-cluster-management=false,multi-cluster-management-agent=false,managed-system-upgrade-controller=false
   useBundledSystemChart: true
   bootstrapPassword: admin
   hostPort: 0
   global:
     cattle:
       psp:
         enabled: false
-rancherInstallerImage: rancher/system-agent-installer-rancher:v2.9.2
+rancherInstallerImage: rancher/system-agent-installer-rancher:v2.10.1
diff --git a/package/harvester-os/templates/91-harvester-bootstrap-repo.yaml b/package/harvester-os/templates/91-harvester-bootstrap-repo.yaml
@@ -19,6 +19,12 @@ resources:
           image: $CLUSTER_REPO_IMAGE
           ports:
           - containerPort: 80
+          readinessProbe:
+            httpGet:
+              path: /charts/index.yaml
+              port: 80
+            initialDelaySeconds: 3
+            periodSeconds: 10
 - apiVersion: v1
   kind: Service
   metadata:

diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt
@@ -1,5 +1,5 @@
-docker.io/rancher/fleet-agent:v0.10.4
-docker.io/rancher/fleet:v0.10.4
+docker.io/rancher/fleet-agent:v0.11.2
+docker.io/rancher/fleet:v0.11.2
 docker.io/rancher/gitjob:v0.9.8
 docker.io/rancher/kubectl:v1.20.2
 docker.io/rancher/kubectl:v1.21.5
@@ -16,16 +16,16 @@ docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.65.
 docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.65.1
 docker.io/rancher/mirrored-prometheus-prometheus:v2.45.0
 docker.io/rancher/mirrored-prometheus-alertmanager:v0.26.0
-docker.io/rancher/rancher-webhook:v0.5.3
-docker.io/rancher/rancher:v2.9.3
-docker.io/rancher/rancher-agent:v2.9.3
+docker.io/rancher/rancher-webhook:v0.6.2
+docker.io/rancher/rancher:v2.10.1
+docker.io/rancher/rancher-agent:v2.10.1
 docker.io/rancher/shell:v0.1.26
 docker.io/rancher/shell:v0.1.24
-docker.io/rancher/shell:v0.2.2
-docker.io/rancher/system-agent:v0.3.10-suc
-docker.io/rancher/system-upgrade-controller:v0.13.4
+docker.io/rancher/shell:v0.3.0
+docker.io/rancher/system-agent:v0.3.11-suc
+docker.io/rancher/system-upgrade-controller:v0.14.2
 docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
 docker.io/rancher/mirrored-kube-logging-logging-operator:4.4.0
 docker.io/rancher/mirrored-fluent-fluent-bit:2.2.0
 docker.io/rancher/mirrored-jimmidyson-configmap-reload:v0.4.0
-docker.io/rancher/mirrored-cluster-api-controller:v1.7.3
+docker.io/rancher/mirrored-cluster-api-controller:v1.8.3
diff --git a/scripts/images/rancherd-bootstrap-images.txt b/scripts/images/rancherd-bootstrap-images.txt
@@ -1,2 +1,2 @@
-docker.io/rancher/system-agent-installer-rancher:v2.9.3
+docker.io/rancher/system-agent-installer-rancher:v2.10.1
 docker.io/rancher/system-agent-installer-rke2:$RKE2_VERSION
diff --git a/scripts/version-rancher b/scripts/version-rancher
@@ -1 +1 @@
-RANCHER_VERSION="v2.9.3"
+RANCHER_VERSION="v2.10.1"
diff --git a/scripts/version-rke2 b/scripts/version-rke2
@@ -1 +1 @@
-RKE2_VERSION="v1.30.7+rke2r1"
+RKE2_VERSION="v1.31.4+rke2r1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		RANCHER_VERSION="v2.9.3"
		RANCHER_VERSION="v2.10.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		RKE2_VERSION="v1.30.7+rke2r1"
		RKE2_VERSION="v1.31.4+rke2r1"