From 2750595281873a637b854ed654c901650e49e1e0 Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Wed, 8 Jan 2025 13:42:07 +0800 Subject: [PATCH 1/2] feat: bump RKE2 to v1.31.4+rke2r1 Signed-off-by: PoAn Yang --- scripts/version-rke2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version-rke2 b/scripts/version-rke2 index 1bb1a1f26..ba9d18298 100644 --- a/scripts/version-rke2 +++ b/scripts/version-rke2 @@ -1 +1 @@ -RKE2_VERSION="v1.30.7+rke2r1" +RKE2_VERSION="v1.31.4+rke2r1" From 976c04df35d8edd85dd302cbb82b9ad9bfdc85f9 Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Wed, 15 Jan 2025 18:13:26 +0800 Subject: [PATCH 2/2] feat: bump rancher to v2.10.1 Signed-off-by: PoAn Yang --- .../rancherd/config.yaml.d/50-defaults.yaml | 4 ++-- scripts/images/rancher-images.txt | 18 +++++++++--------- scripts/images/rancherd-bootstrap-images.txt | 2 +- scripts/version-rancher | 2 +- 4 files changed, 13 insertions(+), 13 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 index 465c80ba3..daeba15f3 100644 --- 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,7 +1,7 @@ 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 useBundledSystemChart: true @@ -11,4 +11,4 @@ rancherValues: 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/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt index 5181e4edf..3683f5824 100644 --- 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 index 444c3e14b..78cc5c430 100644 --- 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 index b92f192b4..c709b5dfe 100644 --- a/scripts/version-rancher +++ b/scripts/version-rancher @@ -1 +1 @@ -RANCHER_VERSION="v2.9.3" +RANCHER_VERSION="v2.10.1"