diff --git a/infrastructure/base/system-upgrades/fedora/fedora-autoupdate.yaml b/infrastructure/base/system-upgrades/fedora/fedora-autoupdate.yaml index a123fa8dd75813ea79440b2e2a843a66d7fbe116..8079a6fcdc0441e4cf849d8023421b3c1bc2105a 100644 --- a/infrastructure/base/system-upgrades/fedora/fedora-autoupdate.yaml +++ b/infrastructure/base/system-upgrades/fedora/fedora-autoupdate.yaml @@ -15,7 +15,7 @@ stringData: systemctl start --wait dnf-automatic-install.service systemctl enable clevis-luks-askpass.path if ! dnf needs-restarting --reboothint; then - touch /var/run/reboot-required + touch /run/reboot-required fi --- apiVersion: upgrade.cattle.io/v1 diff --git a/infrastructure/base/system-upgrades/kured.yaml b/infrastructure/base/system-upgrades/kured.yaml index 4cf8963e92604f30d975fcba39175e43de2856fc..23429f1391fb8b872e8e8cb90f31b8b4b10932c0 100644 --- a/infrastructure/base/system-upgrades/kured.yaml +++ b/infrastructure/base/system-upgrades/kured.yaml @@ -39,20 +39,15 @@ metadata: namespace: system-upgrade data: values.yaml: | - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: feature.node.kubernetes.io/system-os_release.ID - operator: NotIn - values: - - talos configuration: + useRebootSentinelHostPath: true annotateNodes: true preferNoScheduleTaint: weave.works/kured-node-reboot blockingPodSelector: - upgrade.cattle.io/plan + rebootSentinel: "/run/reboot-required" + rebootMethod: command + rebootCommand: /sbin/shutdown --reboot hostNetwork: false metrics: create: true diff --git a/infrastructure/base/system-upgrades/talos/os.yaml b/infrastructure/base/system-upgrades/talos/os.yaml index 2aa873c77e942b1adf8493bd993fd12a1e8e78fe..333a215ee7ce3318812d07124af0c040ceac949b 100644 --- a/infrastructure/base/system-upgrades/talos/os.yaml +++ b/infrastructure/base/system-upgrades/talos/os.yaml @@ -12,11 +12,6 @@ spec: path: /var/run/secrets/talos.dev ignoreUpdates: true concurrency: 1 - exclusive: true - drain: - deleteLocalData: true - ignoreDaemonSets: true - force: false nodeSelector: matchExpressions: - key: feature.node.kubernetes.io/system-os_release.ID @@ -25,7 +20,7 @@ spec: - talos - key: upgrade.shivering-isles.com/talos-autoupdate operator: Exists - upgrade: + prepare: image: ghcr.io/siderolabs/talosctl envs: - name: NODE_IP @@ -38,6 +33,7 @@ spec: - --nodes=$(NODE_IP) - upgrade - --image=$(TALOS_IMAGE):$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION) - - --preserve=true - - --wait=false - - --reboot-mode=powercycle + - --stage + upgrade: + image: quay.io/fedora/fedora:41 + command: ["touch", "/host/run/reboot-required"] \ No newline at end of file