diff --git a/infrastructure/system-upgrades/fedora.yaml b/infrastructure/system-upgrades/fedora.yaml index 0dd065a08bc7c7ddba718c3d3936cccaed3937e5..1be5656ca9cb9e3b3afff66685f8436501e1529e 100644 --- a/infrastructure/system-upgrades/fedora.yaml +++ b/infrastructure/system-upgrades/fedora.yaml @@ -26,8 +26,14 @@ spec: concurrency: 1 nodeSelector: matchExpressions: - - {key: feature.node.kubernetes.io/system-os_release.ID, operator: In, values: ["fedora"]} - - {key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major, operator: In, values: ["35"]} + - key: feature.node.kubernetes.io/system-os_release.ID + operator: In + values: + - fedora + - key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major + operator: In + values: + - "35" serviceAccountName: system-upgrade secrets: - name: fedora-dnf-upgrade diff --git a/infrastructure/system-upgrades/longhorn-lvm.yaml b/infrastructure/system-upgrades/longhorn-lvm.yaml index a1e9c6d30127c8f43d55e2efd096c44f5535a781..1c0155178c7f5c7ee1b4facd5bba5cc2675a3707 100644 --- a/infrastructure/system-upgrades/longhorn-lvm.yaml +++ b/infrastructure/system-upgrades/longhorn-lvm.yaml @@ -14,7 +14,6 @@ stringData: secrets="$(dirname $0)" VG_NAME="$(vgs | tail -n +2 | awk '{print $1}')" LV_NAME=longhorn - # Validate Volume Group existence if ! echo "$VG_NAME" | grep "fedora"; then echo "Failed to find volume group" >&2 @@ -74,7 +73,8 @@ spec: concurrency: 1 nodeSelector: matchExpressions: - - {key: plan.upgrade.cattle.io/longhorn-setup, operator: Exists} + - key: plan.upgrade.cattle.io/longhorn-setup + operator: Exists serviceAccountName: system-upgrade secrets: - name: longhorn-lvm diff --git a/infrastructure/system-upgrades/longhorn-setup.yaml b/infrastructure/system-upgrades/longhorn-setup.yaml index 75aa34fdb93ee3bd226911a94845421f9c27245b..6bea922129bbe44494325d724baa57e1a7dae66e 100644 --- a/infrastructure/system-upgrades/longhorn-setup.yaml +++ b/infrastructure/system-upgrades/longhorn-setup.yaml @@ -25,8 +25,14 @@ spec: concurrency: 1 nodeSelector: matchExpressions: - - {key: feature.node.kubernetes.io/system-os_release.ID, operator: In, values: ["fedora"]} - - {key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major, operator: In, values: ["35"]} + - key: feature.node.kubernetes.io/system-os_release.ID + operator: In + values: + - "fedora" + - key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major + operator: In + values: + - "35" serviceAccountName: system-upgrade secrets: - name: longhorn-setup