Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump rke2 to v1.27.13+rke2r1 and rancher to v2.8.3 #686

Merged
merged 2 commits into from
May 15, 2024
Merged

bump rke2 to v1.27.13+rke2r1 and rancher to v2.8.3 #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d778a
feat: bump RKE2 to v1.27.13+rke2r1 and Rancher to v2.8.3
FrankYang0529 May 14, 2024
cf02c5e
fix: get CATTLE_FLEET_MIN_VERSION and CATTLE_RANCHER_WEBHOOK_MIN_VERS…
FrankYang0529 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package/harvester-os/files/usr/share/rancher/rancherd/config.yaml.d/50-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions scripts/collect-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
13 changes: 7 additions & 6 deletions scripts/images/rancher-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docker.io/rancher/fleet-agent:v0.9.0
docker.io/rancher/fleet:v0.9.0
docker.io/rancher/gitjob:v0.1.96
docker.io/rancher/fleet-agent:v0.9.2
docker.io/rancher/fleet:v0.9.2
docker.io/rancher/gitjob:v0.9.4
docker.io/rancher/kubectl:v1.20.2
docker.io/rancher/kubectl:v1.21.5
docker.io/rancher/mirrored-grafana-grafana:9.1.5
Expand All @@ -15,10 +15,11 @@ 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.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-webhook:v0.4.3
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/shell:v0.1.23
docker.io/rancher/system-agent:v0.3.6-suc
docker.io/rancher/system-upgrade-controller:v0.13.1
docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
docker.io/rancher/mirrored-banzaicloud-logging-operator:3.17.10
Expand Down
2 changes: 1 addition & 1 deletion scripts/images/rancherd-bootstrap-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/version-rancher
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RANCHER_VERSION="v2.8.2"
RANCHER_VERSION="v2.8.3"
2 changes: 1 addition & 1 deletion scripts/version-rke2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RKE2_VERSION="v1.27.10+rke2r1"
RKE2_VERSION="v1.27.13+rke2r1"
Loading