fix(vm): Use generic model with explicit features for Discovery cpu type

- Add empty CPU model to libvirt cpumap. - Use new CPU model name instead of HostModel, so kubevirt set custom mode for cpu in the libvirt domain. - Add patch to generate Pod without cpu-model node selector for new CPU model. Signed-off-by: Ivan Mikheykin <[email protected]>
deckhouse · Dec 23, 2024 · 2f36d28 · 2f36d28
1 parent 1e32aa0
commit 2f36d28
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/images/virt-launcher/generic-cpu/dvp-generic-cpu.xml b/images/virt-launcher/generic-cpu/dvp-generic-cpu.xml
@@ -0,0 +1,6 @@
+<!-- Empty model for generic CPU. DVP will add features explicitly. -->
+<cpus>
+  <model name='Deckhouse-Virtualization-Platform-Generic'>
+    <decode host='on' guest='on'/>
+  </model>
+</cpus>
diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
@@ -80,6 +80,7 @@ git:
       - '**/*'
     includePaths:
     - scripts
+    - generic-cpu
   # Override libvirt daemon configuration.
   - add: /images/{{ $.ImageName }}
     to: /etc/libvirt
@@ -147,7 +148,12 @@ shell:
   - mv /usr/bin/virt-launcher-monitor /usr/bin/virt-launcher-monitor-orig
   - cp /scripts/virt-launcher-monitor-wrapper.sh /usr/bin/virt-launcher-monitor
   - chmod +x /usr/bin/virt-launcher-monitor
-  # Configure liboverride globally.
+  # Add dvp generic cpu model.
+  - cp /generic-cpu/dvp-generic-cpu.xml /usr/share/libvirt/cpu_map/x86_dvp-generic-cpu.xml
+  #   Concatenation-escaping to produce single quotes.
+  #   The 'x86_486.xml' marker should work for later versions of libvirt where CPUs are grouped.
+  - sed 's#\(filename=.x86_486.xml..>\)#\1 <include filename='"'x86_dvp-generic-cpu.xml'"'/>#' -i /usr/share/libvirt/cpu_map/index.xml
+  # Configure liboverride globally. It should be done in the last stage (setup) to not break stapel commands.
   - cp /etc/ld.so.preload.in /etc/ld.so.preload
   # Create qemu group and user.
   - groupadd --gid 107 qemu && useradd qemu --uid 107 --gid 107 --shell /bin/bash --create-home

diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go
@@ -109,6 +109,7 @@ func (b *KVVM) SetCPUModel(class *virtv2.VirtualMachineClass) error {
 	case virtv2.CPUTypeModel:
 		cpu.Model = class.Spec.CPU.Model
 	case virtv2.CPUTypeFeatures, virtv2.CPUTypeDiscovery:
+		cpu.Model = "Deckhouse-Virtualization-Platform-Generic"
 		features := make([]virtv1.CPUFeature, len(class.Status.CpuFeatures.Enabled))
 		for i, feature := range class.Status.CpuFeatures.Enabled {
 			policy := "require"