From dec0e9a26e350113206ce521710e56aef8eee552 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 5 Oct 2022 18:53:18 +0200
Subject: [PATCH] fix(system-upgrade): Make fedora 36 upgrade idempotent
By simply exiting successful, when F36 is already installed, this should
smoothly make this script idempotent enough for current use.
---
infrastructure/system-upgrades/fedora-system-upgrade.yaml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/infrastructure/system-upgrades/fedora-system-upgrade.yaml b/infrastructure/system-upgrades/fedora-system-upgrade.yaml
index 28a85d542..3c616deda 100644
--- a/infrastructure/system-upgrades/fedora-system-upgrade.yaml
+++ b/infrastructure/system-upgrades/fedora-system-upgrade.yaml
@@ -10,9 +10,12 @@ stringData:
#!/bin/sh
set -e
set -x
+ if grep "Fedora release 36" /etc/fedora-release; then
+ exit 0
+ fi
systemd-run --same-dir --wait --collect --service-type=exec dnf install -y dnf-plugin-system-upgrade
- systemd-run --same-dir --wait --collect --service-type=exec dnf system-upgrade download -y --best --releasever=36 --exclude="kubernetes*"
- systemd-run --same-dir --wait --collect --service-type=exec dnf system-upgrade --exclude="kubernetes*" -y reboot
+ systemd-run --same-dir --wait --collect --service-type=exec dnf system-upgrade download -y --best --releasever=36
+ systemd-run --same-dir --wait --collect --service-type=exec dnf system-upgrade -y reboot
---
apiVersion: upgrade.cattle.io/v1
kind: Plan
--
GitLab