From 39c8ff50938a5eb10f5589a6041559ef11fc5d46 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Tue, 14 Nov 2023 13:28:19 +0800 Subject: [PATCH 1/2] Bump RKE2 to v1.24.17+rke2r1 Signed-off-by: Kiefer Chang --- scripts/version-rke2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version-rke2 b/scripts/version-rke2 index 34a40fe9e..6457bfad9 100644 --- a/scripts/version-rke2 +++ b/scripts/version-rke2 @@ -1 +1 @@ -RKE2_VERSION="v1.24.11+rke2r1" +RKE2_VERSION="v1.24.17+rke2r1" From df960e49749ea22cc499d88071b9da9a94c78e28 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Tue, 14 Nov 2023 13:34:46 +0800 Subject: [PATCH 2/2] Bump Rancher to v2.6.13 Signed-off-by: Kiefer Chang --- .../usr/share/rancher/rancherd/config.yaml.d/50-defaults.yaml | 4 ++-- scripts/images/rancher-images.txt | 4 ++-- scripts/images/rancherd-bootstrap-images.txt | 2 +- scripts/version-rancher | 2 +- 4 files changed, 6 insertions(+), 6 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 4f88acf24..1f1b5ee09 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,10 +1,10 @@ rancherValues: rancherImagePullPolicy: IfNotPresent rancherImage: rancher/rancher - rancherImageTag: v2.6.11 + rancherImageTag: v2.6.13 noDefaultAdmin: false features: multi-cluster-management=false,multi-cluster-management-agent=false useBundledSystemChart: true bootstrapPassword: admin hostPort: 0 -rancherInstallerImage: rancher/system-agent-installer-rancher:v2.6.11 +rancherInstallerImage: rancher/system-agent-installer-rancher:v2.6.13 diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt index e8d735e3f..0574c7311 100644 --- a/scripts/images/rancher-images.txt +++ b/scripts/images/rancher-images.txt @@ -16,8 +16,8 @@ docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.50. docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.50.0 docker.io/rancher/mirrored-prometheus-prometheus:v2.28.1 docker.io/rancher/mirrored-prometheus-alertmanager:v0.22.2 -docker.io/rancher/rancher-webhook:v0.2.9 -docker.io/rancher/rancher:v2.6.11 +docker.io/rancher/rancher-webhook:v0.2.10 +docker.io/rancher/rancher:v2.6.13 docker.io/rancher/shell:v0.1.8 docker.io/rancher/shell:v0.1.19 docker.io/rancher/system-agent:v0.2.13-suc diff --git a/scripts/images/rancherd-bootstrap-images.txt b/scripts/images/rancherd-bootstrap-images.txt index 4ea169715..9e8e23127 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.6.11 +docker.io/rancher/system-agent-installer-rancher:v2.6.13 docker.io/rancher/system-agent-installer-rke2:$RKE2_VERSION diff --git a/scripts/version-rancher b/scripts/version-rancher index f971c7a9b..9ae198dad 100644 --- a/scripts/version-rancher +++ b/scripts/version-rancher @@ -1 +1 @@ -RANCHER_VERSION="v2.6.11" +RANCHER_VERSION="v2.6.13"