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 0ed7a550b..c1c033fb5 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.8.2 + rancherImageTag: v2.8.3 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.8.2 +rancherInstallerImage: rancher/system-agent-installer-rancher:v2.8.3 diff --git a/scripts/collect-deps.sh b/scripts/collect-deps.sh index fa5adde40..2d2b902b0 100755 --- a/scripts/collect-deps.sh +++ b/scripts/collect-deps.sh @@ -57,13 +57,13 @@ update_rancher_deps() local repo_index="${WORKING_DIR}/rancher-charts.yaml" local fleet_versions="${WORKING_DIR}/fleet-versions.txt" local webhook_versions="${WORKING_DIR}/webhook-versions.txt" - local rancher_image_envs="${WORKING_DIR}/rancher-envs.txt" + local rancher_build_yaml="${WORKING_DIR}/rancher-build.yaml" local rancher_image="rancher/rancher:$rancher_version" # Get min verseion from rancher image's env variables - docker image inspect $rancher_image | jq '.[0].Config.Env' | yq e '.[]' - > "$rancher_image_envs" - CATTLE_FLEET_MIN_VERSION=$(bash -c "source $rancher_image_envs && echo \$CATTLE_FLEET_VERSION") - CATTLE_RANCHER_WEBHOOK_MIN_VERSION=$(bash -c "source $rancher_image_envs && echo \$CATTLE_RANCHER_WEBHOOK_VERSION") + curl https://raw.githubusercontent.com/rancher/rancher/$rancher_version/build.yaml -o $rancher_build_yaml + CATTLE_FLEET_MIN_VERSION=$(yq e .fleetVersion $rancher_build_yaml) + CATTLE_RANCHER_WEBHOOK_MIN_VERSION=$(yq e .webhookVersion $rancher_build_yaml) # Extract rancher-charts helm index file repo_hash=$(docker run --rm --entrypoint=/bin/bash "$rancher_image" -c "ls /var/lib/rancher-data/local-catalogs/v2/rancher-charts | head -n1") diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt index 0d9a993fe..7e1f222f6 100644 --- a/scripts/images/rancher-images.txt +++ b/scripts/images/rancher-images.txt @@ -16,7 +16,7 @@ docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.65.1 docker.io/rancher/mirrored-prometheus-prometheus:v2.42.0 docker.io/rancher/mirrored-prometheus-alertmanager:v0.25.0 docker.io/rancher/rancher-webhook:v0.4.2 -docker.io/rancher/rancher:v2.8.2 +docker.io/rancher/rancher:v2.8.3 docker.io/rancher/shell:v0.1.22 docker.io/rancher/system-agent:v0.3.4-suc docker.io/rancher/system-upgrade-controller:v0.13.1 diff --git a/scripts/images/rancherd-bootstrap-images.txt b/scripts/images/rancherd-bootstrap-images.txt index 963a45c91..8dfa8f9ec 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.8.2 +docker.io/rancher/system-agent-installer-rancher:v2.8.3 docker.io/rancher/system-agent-installer-rke2:$RKE2_VERSION diff --git a/scripts/version-rancher b/scripts/version-rancher index eb24209a6..2df49574c 100644 --- a/scripts/version-rancher +++ b/scripts/version-rancher @@ -1 +1 @@ -RANCHER_VERSION="v2.8.2" +RANCHER_VERSION="v2.8.3" diff --git a/scripts/version-rke2 b/scripts/version-rke2 index 19b86792d..adb688417 100644 --- a/scripts/version-rke2 +++ b/scripts/version-rke2 @@ -1 +1 @@ -RKE2_VERSION="v1.27.10+rke2r1" +RKE2_VERSION="v1.27.13+rke2r1"