Repository navigation
Commit e28681a
authored
fix(kubevirt-instancetypes): restore persistent EFI/TPM state (#3154)
## What this PR does
Reverts #3006, restoring upstream's persistent EFI/TPM firmware state
for the `windows.11` / `windows.2k22` / `windows.2k25` preferences (and
their `.virtio` variants).
#3006 dropped persistent EFI/TPM to "unblock live-migration", on the
assumption that an RWO Filesystem backend-storage PVC pins the VM to its
node. That assumption was outdated: KubeVirt has live-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; the regression described in #3005 was a misdiagnosis.
Verified on a KubeVirt v1.8.2 cluster: a persistent-EFI VM with an RWO
Filesystem backend PVC reports `LiveMigratable=True`, and the
copy-on-target backend PVC is created when a migration starts. KubeVirt
maintainers confirmed the same upstream.
This restores persistent firmware state so in-guest Microsoft UEFI CA /
Secure Boot enrollment survives reboots and migrations.
### Release note
```release-note
fix(kubevirt-instancetypes): restore persistent EFI/TPM state for Windows preferences — RWO-Filesystem backend storage already live-migrates (KubeVirt v1.4+), so persistence no longer needs to be stripped
```
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Updated Windows instance type preferences to keep TPM persistence
enabled, improving compatibility and reducing storage-related issues.
* Ensured firmware and TPM persistence settings are preserved during
instance type preference generation for more reliable outcomes.
* **Chores**
* Streamlined the preference generation step so instance type templates
are produced consistently without removing persistence configuration.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->2 files changed
Lines changed: 18 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | 19 | | |
26 | 20 | | |
27 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1352 | 1352 | | |
1353 | 1353 | | |
1354 | 1354 | | |
1355 | | - | |
| 1355 | + | |
| 1356 | + | |
1356 | 1357 | | |
1357 | 1358 | | |
1358 | 1359 | | |
| |||
1374 | 1375 | | |
1375 | 1376 | | |
1376 | 1377 | | |
| 1378 | + | |
1377 | 1379 | | |
1378 | 1380 | | |
1379 | 1381 | | |
| |||
1422 | 1424 | | |
1423 | 1425 | | |
1424 | 1426 | | |
1425 | | - | |
| 1427 | + | |
| 1428 | + | |
1426 | 1429 | | |
1427 | 1430 | | |
1428 | 1431 | | |
| |||
1444 | 1447 | | |
1445 | 1448 | | |
1446 | 1449 | | |
| 1450 | + | |
1447 | 1451 | | |
1448 | 1452 | | |
1449 | 1453 | | |
| |||
1890 | 1894 | | |
1891 | 1895 | | |
1892 | 1896 | | |
1893 | | - | |
| 1897 | + | |
| 1898 | + | |
1894 | 1899 | | |
1895 | 1900 | | |
1896 | 1901 | | |
| |||
1912 | 1917 | | |
1913 | 1918 | | |
1914 | 1919 | | |
| 1920 | + | |
1915 | 1921 | | |
1916 | 1922 | | |
1917 | 1923 | | |
| |||
1960 | 1966 | | |
1961 | 1967 | | |
1962 | 1968 | | |
1963 | | - | |
| 1969 | + | |
| 1970 | + | |
1964 | 1971 | | |
1965 | 1972 | | |
1966 | 1973 | | |
| |||
1982 | 1989 | | |
1983 | 1990 | | |
1984 | 1991 | | |
| 1992 | + | |
1985 | 1993 | | |
1986 | 1994 | | |
1987 | 1995 | | |
| |||
2028 | 2036 | | |
2029 | 2037 | | |
2030 | 2038 | | |
2031 | | - | |
| 2039 | + | |
| 2040 | + | |
2032 | 2041 | | |
2033 | 2042 | | |
2034 | 2043 | | |
| |||
2050 | 2059 | | |
2051 | 2060 | | |
2052 | 2061 | | |
| 2062 | + | |
2053 | 2063 | | |
2054 | 2064 | | |
2055 | 2065 | | |
| |||
2098 | 2108 | | |
2099 | 2109 | | |
2100 | 2110 | | |
2101 | | - | |
| 2111 | + | |
| 2112 | + | |
2102 | 2113 | | |
2103 | 2114 | | |
2104 | 2115 | | |
| |||
2120 | 2131 | | |
2121 | 2132 | | |
2122 | 2133 | | |
| 2134 | + | |
2123 | 2135 | | |
2124 | 2136 | | |
2125 | 2137 | | |
| |||
0 commit comments