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

arm upgrade fix: patch harvester-release.yaml for arm iso builds #932

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

arm upgrade fix: patch harvester-release.yaml for arm iso builds #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions scripts/package-harvester-os
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ fi

mkdir -p ${ARTIFACTS_DIR}


source ${SCRIPTS_DIR}/version
source ${SCRIPTS_DIR}/version-rke2
source ${SCRIPTS_DIR}/version-rancher
Expand All @@ -23,6 +24,29 @@ source ${SCRIPTS_DIR}/version-monitoring
source ${SCRIPTS_DIR}/version-logging
source ${SCRIPTS_DIR}/lib/iso

# Revert harvester chart version patch to clean dirty git status
reset_charts() {
pushd ${TOP_DIR}/../harvester
git checkout -- ./deploy/charts
popd
}

source ${SCRIPTS_DIR}/hack/patch-harvester-chart
harvester_chart_path=${TOP_DIR}/../harvester/deploy/charts/harvester
## for arm based builds we need to patch harvester chart
## we need to temporarily copy the values.yaml for arm builds
## to ensure correct kubevirt version is used
## in the function until mutli-arch image builds are available in registry.suse.com for kubevirt sles15
if [ ${ARCH} == "arm64" ]
then
patch_harvester_chart ${harvester_chart_path}
fi

# ARM builds need this version before resetting the chart
HARVESTER_KUBEVIRT_VERSION=$(yq e '.kubevirt-operator.containers.operator.image.tag' ${harvester_chart_path}/values.yaml)
reset_charts


BASE_OS_IMAGE="rancher/harvester-os:sle-micro-head"
HARVESTER_OS_IMAGE=rancher/harvester-os:$VERSION

Expand Down
1 change: 0 additions & 1 deletion scripts/version-harvester
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
HARVESTER_VERSION=$(cd $1; source ./scripts/version &> /dev/null; echo $VERSION)
HARVESTER_APP_VERSION=$(cd $1; source ./scripts/version &> /dev/null; echo $APP_VERSION)
HARVESTER_CHART_VERSION=$(cd $1; source ./scripts/version &> /dev/null; echo $CHART_VERSION)
HARVESTER_KUBEVIRT_VERSION=$(yq e '.kubevirt-operator.containers.operator.image.tag' $1/deploy/charts/harvester/values.yaml)
HARVESTER_MIN_UPGRADABLE_VERSION=$(cd $1; source ./scripts/version &> /dev/null; echo $MIN_UPGRADABLE_VERSION)
Loading