Skip to content

Commit 4cc60e3

Browse files
fix(kubevirt-instancetypes): drop persistent strip that produced null TPM
`make update` stripped `persistent: true` from upstream's `preferredTPM: { persistent: true }`, leaving the parent key with a null value. KubeVirt v1.6's CRD tolerated it; v1.8 (the operator version we bumped to in 6af0bf7) enforces structural schema and rejects null: VirtualMachineClusterPreference "windows.11" is invalid: spec.devices.preferredTPM: Invalid value: "null": spec.devices.preferredTPM in body must be of type object: "null" Stop stripping the line and regenerate the templates from upstream common-instancetypes. Persistent TPM state falls back to the cluster default StorageClass with RWO access mode when `vmStateStorageClass` is unset on the KubeVirt CR, per pkg/storage/backend-storage/backend-storage.go. Drive-by from the regen: - Removed (upstream EOL): centos.7*, centos.stream8* - Added: debian, oraclelinux, legacy, linux*, fedora.s390x, rhel.{9,10}.s390x, windows.{xp,7,7.virtio,2k3,2k8,2k8.virtio,2k12,2k12.virtio}, plus new cx1.*1gi and d1 instancetype variants. Also regenerates packages/apps/vm-instance instanceProfile enum (values.schema.json / README.md) from the refreshed preferences.yaml. Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent d1ad595 commit 4cc60e3

5 files changed

Lines changed: 1944 additions & 376 deletions

File tree

‎packages/apps/vm-instance/values.schema.json‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,26 @@
5454
"default": "ubuntu",
5555
"enum": [
5656
"alpine",
57-
"centos.7",
58-
"centos.7.desktop",
5957
"centos.stream10",
6058
"centos.stream10.desktop",
61-
"centos.stream8",
62-
"centos.stream8.desktop",
63-
"centos.stream8.dpdk",
6459
"centos.stream9",
6560
"centos.stream9.desktop",
6661
"centos.stream9.dpdk",
6762
"cirros",
63+
"debian",
6864
"fedora",
6965
"fedora.arm64",
66+
"fedora.s390x",
67+
"legacy",
68+
"linux",
69+
"linux.efi",
70+
"linux.virtiotransitional",
7071
"opensuse.leap",
7172
"opensuse.tumbleweed",
73+
"oraclelinux",
7274
"rhel.10",
7375
"rhel.10.arm64",
76+
"rhel.10.s390x",
7477
"rhel.7",
7578
"rhel.7.desktop",
7679
"rhel.8",
@@ -81,12 +84,15 @@
8184
"rhel.9.desktop",
8285
"rhel.9.dpdk",
8386
"rhel.9.realtime",
87+
"rhel.9.s390x",
8488
"sles",
8589
"ubuntu",
8690
"windows.10",
8791
"windows.10.virtio",
8892
"windows.11",
8993
"windows.11.virtio",
94+
"windows.2k12",
95+
"windows.2k12.virtio",
9096
"windows.2k16",
9197
"windows.2k16.virtio",
9298
"windows.2k19",
@@ -95,6 +101,12 @@
95101
"windows.2k22.virtio",
96102
"windows.2k25",
97103
"windows.2k25.virtio",
104+
"windows.2k3",
105+
"windows.2k8",
106+
"windows.2k8.virtio",
107+
"windows.7",
108+
"windows.7.virtio",
109+
"windows.xp",
98110
""
99111
]
100112
},

‎packages/system/kubevirt-instancetypes/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ update:
1010
yq -i 'select(.kind != "VirtualMachinePreference")' templates/preferences.yaml
1111
kustomize build https://github.com/kubevirt/common-instancetypes/instancetypes > templates/instancetypes.yaml
1212
yq -i 'select(.kind != "VirtualMachineInstancetype")' templates/instancetypes.yaml
13-
sed -i '/persistent: true/d' templates/preferences.yaml

0 commit comments

Comments
 (0)