From 3ae10a5db06e82b449c7254cdcca46474b92c4f7 Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Fri, 20 Dec 2024 10:56:50 +0800 Subject: [PATCH] feat: bump rancher to v2.9.3 and RKE2 to v1.30.7+rke2r1 Signed-off-by: PoAn Yang (cherry picked from commit 4f6e6895aabdf491c1ca0e1aed54073879af436f) --- .../rancher/rancherd/config.yaml.d/50-defaults.yaml | 2 +- scripts/images/rancher-images.txt | 13 +++++++------ scripts/images/rancherd-bootstrap-images.txt | 2 +- scripts/version-rancher | 2 +- scripts/version-rke2 | 2 +- 5 files changed, 11 insertions(+), 10 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 afdf34eb2..465c80ba3 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.2 + rancherImageTag: v2.9.3 noDefaultAdmin: false features: multi-cluster-management=false,multi-cluster-management-agent=false useBundledSystemChart: true diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt index fe4bf6833..5181e4edf 100644 --- a/scripts/images/rancher-images.txt +++ b/scripts/images/rancher-images.txt @@ -1,5 +1,5 @@ -docker.io/rancher/fleet-agent:v0.10.2 -docker.io/rancher/fleet:v0.10.2 +docker.io/rancher/fleet-agent:v0.10.4 +docker.io/rancher/fleet:v0.10.4 docker.io/rancher/gitjob:v0.9.8 docker.io/rancher/kubectl:v1.20.2 docker.io/rancher/kubectl:v1.21.5 @@ -16,12 +16,13 @@ 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.2 -docker.io/rancher/rancher:v2.9.2 +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/shell:v0.1.26 docker.io/rancher/shell:v0.1.24 -docker.io/rancher/shell:v0.2.1 -docker.io/rancher/system-agent:v0.3.9-suc +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/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5 docker.io/rancher/mirrored-kube-logging-logging-operator:4.4.0 diff --git a/scripts/images/rancherd-bootstrap-images.txt b/scripts/images/rancherd-bootstrap-images.txt index d802f8c9e..444c3e14b 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.2 +docker.io/rancher/system-agent-installer-rancher:v2.9.3 docker.io/rancher/system-agent-installer-rke2:$RKE2_VERSION diff --git a/scripts/version-rancher b/scripts/version-rancher index c1d23c9f1..b92f192b4 100644 --- a/scripts/version-rancher +++ b/scripts/version-rancher @@ -1 +1 @@ -RANCHER_VERSION="v2.9.2" +RANCHER_VERSION="v2.9.3" diff --git a/scripts/version-rke2 b/scripts/version-rke2 index 27381ad5b..1bb1a1f26 100644 --- a/scripts/version-rke2 +++ b/scripts/version-rke2 @@ -1 +1 @@ -RKE2_VERSION="v1.29.9+rke2r1" +RKE2_VERSION="v1.30.7+rke2r1"