patch

Signed-off-by: Valeriy Khorunzhin <[email protected]>
deckhouse · Nov 25, 2024 · 7b83303 · 7b83303
1 parent 3456c5d
commit 7b83303
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch
@@ -1,15 +1,16 @@
 diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go
-index 6860766acd..f522702f33 100644
+index 6860766acd..127ea05475 100644
 --- a/pkg/instancetype/instancetype.go
 +++ b/pkg/instancetype/instancetype.go
-@@ -1600,6 +1600,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine
- 	if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil {
- 		vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial)
+@@ -553,6 +553,8 @@ func (m *InstancetypeMethods) ApplyToVmi(field *k8sfield.Path, instancetypeSpec
+ 		conflicts = append(conflicts, applyInstanceTypeAnnotations(instancetypeSpec.Annotations, vmiMetadata)...)
  	}
-+	vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true)
 
- 	if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil {
- 		vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy()
++	vmiSpec.Domain.Firmware.Bootloader.BIOS.UseSerial = pointer.P(true)
++
+ 	if preferenceSpec != nil {
+ 		// By design Preferences can't conflict with the VMI so we don't return any
+ 		applyCPUPreferences(preferenceSpec, vmiSpec)
 diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go
 index 0565ceb5dd..fae3f33aca 100644
 --- a/pkg/virt-launcher/virtwrap/converter/converter.go