Skip to content

Commit 59f035f

Browse files
kvapsmyasnikovdaniil
authored andcommitted
fix(kubevirt-instancetypes): restore persistent EFI/TPM state
Reverts #3006. Dropping persistent EFI/TPM was motivated by a live-migration concern that rested on an outdated assumption — that an RWO Filesystem backend-storage PVC pins the VM to its node. KubeVirt has migrated RWO-Filesystem backend storage since v1.4 (kubevirt/kubevirt#12629): on migration it creates a fresh target state PVC and copies the small state blob, so persistent-EFI/TPM VMs on the default replicated storage live-migrate fine (verified: the VM reports LiveMigratable=True and the copy-on-target PVC is created on migration). Restore upstream's persistent firmware state for the windows.* preferences. Assisted-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
1 parent e27c586 commit 59f035f

2 files changed

Lines changed: 18 additions & 12 deletions

File tree

‎packages/system/kubevirt-instancetypes/Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ update:
1616
mkdir templates
1717
kustomize build https://github.com/kubevirt/common-instancetypes/preferences?ref=$(COMMON_INSTANCETYPES_REF) > templates/preferences.yaml
1818
yq -i 'select(.kind != "VirtualMachinePreference")' templates/preferences.yaml
19-
# TEMPORARY (see #3005): drop persistent EFI/TPM state. With persistence on,
20-
# KubeVirt creates a backend-storage PVC that is RWO on the default StorageClass,
21-
# which pins the VM to its node and blocks live-migration / drain. Use `del` (not
22-
# `sed -d`) so an emptied preferredTPM stays `{}` rather than null, which the
23-
# KubeVirt v1.8 CRD structural schema rejects. Revert once vm-state can request RWX.
24-
yq -i 'del(.spec.firmware.preferredEfi.persistent) | del(.spec.devices.preferredTPM.persistent)' templates/preferences.yaml
2519
kustomize build https://github.com/kubevirt/common-instancetypes/instancetypes?ref=$(COMMON_INSTANCETYPES_REF) > templates/instancetypes.yaml
2620
yq -i 'select(.kind != "VirtualMachineInstancetype")' templates/instancetypes.yaml
2721
# Re-append Cozystack-local instancetypes the pinned catalog no longer ships

‎packages/system/kubevirt-instancetypes/templates/preferences.yaml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,8 @@ spec:
13521352
preferredAutoattachInputDevice: true
13531353
preferredDiskBus: sata
13541354
preferredInterfaceModel: e1000e
1355-
preferredTPM: {}
1355+
preferredTPM:
1356+
persistent: true
13561357
features:
13571358
preferredAcpi: {}
13581359
preferredApic: {}
@@ -1374,6 +1375,7 @@ spec:
13741375
preferredSmm: {}
13751376
firmware:
13761377
preferredEfi:
1378+
persistent: true
13771379
secureBoot: true
13781380
preferredTerminationGracePeriodSeconds: 3600
13791381
requirements:
@@ -1422,7 +1424,8 @@ spec:
14221424
preferredInputBus: virtio
14231425
preferredInputType: tablet
14241426
preferredInterfaceModel: virtio
1425-
preferredTPM: {}
1427+
preferredTPM:
1428+
persistent: true
14261429
features:
14271430
preferredAcpi: {}
14281431
preferredApic: {}
@@ -1444,6 +1447,7 @@ spec:
14441447
preferredSmm: {}
14451448
firmware:
14461449
preferredEfi:
1450+
persistent: true
14471451
secureBoot: true
14481452
preferredTerminationGracePeriodSeconds: 3600
14491453
requirements:
@@ -1890,7 +1894,8 @@ spec:
18901894
preferredAutoattachInputDevice: true
18911895
preferredDiskBus: sata
18921896
preferredInterfaceModel: e1000e
1893-
preferredTPM: {}
1897+
preferredTPM:
1898+
persistent: true
18941899
features:
18951900
preferredAcpi: {}
18961901
preferredApic: {}
@@ -1912,6 +1917,7 @@ spec:
19121917
preferredSmm: {}
19131918
firmware:
19141919
preferredEfi:
1920+
persistent: true
19151921
secureBoot: true
19161922
preferredTerminationGracePeriodSeconds: 3600
19171923
requirements:
@@ -1960,7 +1966,8 @@ spec:
19601966
preferredInputBus: virtio
19611967
preferredInputType: tablet
19621968
preferredInterfaceModel: virtio
1963-
preferredTPM: {}
1969+
preferredTPM:
1970+
persistent: true
19641971
features:
19651972
preferredAcpi: {}
19661973
preferredApic: {}
@@ -1982,6 +1989,7 @@ spec:
19821989
preferredSmm: {}
19831990
firmware:
19841991
preferredEfi:
1992+
persistent: true
19851993
secureBoot: true
19861994
preferredTerminationGracePeriodSeconds: 3600
19871995
requirements:
@@ -2028,7 +2036,8 @@ spec:
20282036
preferredAutoattachInputDevice: true
20292037
preferredDiskBus: sata
20302038
preferredInterfaceModel: e1000e
2031-
preferredTPM: {}
2039+
preferredTPM:
2040+
persistent: true
20322041
features:
20332042
preferredAcpi: {}
20342043
preferredApic: {}
@@ -2050,6 +2059,7 @@ spec:
20502059
preferredSmm: {}
20512060
firmware:
20522061
preferredEfi:
2062+
persistent: true
20532063
secureBoot: true
20542064
preferredTerminationGracePeriodSeconds: 3600
20552065
requirements:
@@ -2098,7 +2108,8 @@ spec:
20982108
preferredInputBus: virtio
20992109
preferredInputType: tablet
21002110
preferredInterfaceModel: virtio
2101-
preferredTPM: {}
2111+
preferredTPM:
2112+
persistent: true
21022113
features:
21032114
preferredAcpi: {}
21042115
preferredApic: {}
@@ -2120,6 +2131,7 @@ spec:
21202131
preferredSmm: {}
21212132
firmware:
21222133
preferredEfi:
2134+
persistent: true
21232135
secureBoot: true
21242136
preferredTerminationGracePeriodSeconds: 3600
21252137
requirements:

0 commit comments

Comments
 (0)