From f921c38c442b3bd7773c8446cf946da555517ed6 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 3 Oct 2024 16:21:05 +0300 Subject: [PATCH] Don't reboot when upgrading recovery through kubernetes (#1092) because it's not idempotent, the script never returns 0 and thus the upgrade is restarted after reboot, causing a boot loop. As described here: https://github.com/rancher/system-upgrade-controller/issues/23#issuecomment-583003758 Signed-off-by: Dimitris Karakasilis --- packages/system/suc-upgrade/definition.yaml | 2 +- packages/system/suc-upgrade/suc-upgrade.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/system/suc-upgrade/definition.yaml b/packages/system/suc-upgrade/definition.yaml index 9b411f5..ce2f3e9 100644 --- a/packages/system/suc-upgrade/definition.yaml +++ b/packages/system/suc-upgrade/definition.yaml @@ -1,3 +1,3 @@ name: "suc-upgrade" category: "system" -version: "0.2.2" +version: "0.2.3" diff --git a/packages/system/suc-upgrade/suc-upgrade.sh b/packages/system/suc-upgrade/suc-upgrade.sh index 56baedf..f89ea64 100644 --- a/packages/system/suc-upgrade/suc-upgrade.sh +++ b/packages/system/suc-upgrade/suc-upgrade.sh @@ -22,8 +22,9 @@ while [[ "$#" -gt 0 ]]; do done if [ "$recovery_mode" = true ]; then kairos-agent upgrade --recovery --source dir:/ + exit 0 # no need to reboot when upgrading recovery else kairos-agent upgrade --source dir:/ + nsenter -i -m -t 1 -- reboot + exit 1 fi -nsenter -i -m -t 1 -- reboot -exit 1