fix

Signed-off-by: yaroslavborbat <[email protected]>
deckhouse · Jan 18, 2025 · a0d0877 · a0d0877
1 parent 9ec7eec
commit a0d0877
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 4 deletions.
diff --git a/api/client/kubeclient/vm.go b/api/client/kubeclient/vm.go
@@ -160,6 +160,7 @@ func (v vm) AddVolume(ctx context.Context, name string, opts v1alpha2.VirtualMac
 		Param("volumeKind", opts.VolumeKind).
 		Param("pvcName", opts.PVCName).
 		Param("image", opts.Image).
+		Param("isCdrom", strconv.FormatBool(opts.IsCdrom)).
 		Do(ctx).
 		Error()
 }

diff --git a/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
diff --git a/api/subresources/types.go b/api/subresources/types.go
@@ -57,7 +57,7 @@ type VirtualMachineAddVolume struct {
 	VolumeKind string
 	PVCName    string
 	Image      string
-	AsCdrom    bool
+	IsCdrom    bool
 }
 
 // +genclient

diff --git a/api/subresources/v1alpha2/types.go b/api/subresources/v1alpha2/types.go
@@ -59,7 +59,7 @@ type VirtualMachineAddVolume struct {
 	VolumeKind      string `json:"volumeKind"`
 	PVCName         string `json:"pvcName"`
 	Image           string `json:"image"`
-	AsCdrom         bool   `json:"asCdrom"`
+	IsCdrom         bool   `json:"isCdrom"`
 }
 
 // +genclient

diff --git a/api/subresources/v1alpha2/zz_generated.conversion.go b/api/subresources/v1alpha2/zz_generated.conversion.go
diff --git a/images/virtualization-artifact/pkg/apiserver/registry/vm/rest/add_volume.go b/images/virtualization-artifact/pkg/apiserver/registry/vm/rest/add_volume.go
@@ -104,7 +104,7 @@ func (r AddVolumeREST) requestFromKubevirt(opts *subresources.VirtualMachineAddV
 
 func (r AddVolumeREST) genMutateRequestHook(opts *subresources.VirtualMachineAddVolume) (mutateRequestHook, error) {
 	var dd virtv1.DiskDevice
-	if opts.AsCdrom {
+	if opts.IsCdrom {
 		dd.CDRom = &virtv1.CDRomTarget{
 			Bus: virtv1.DiskBusSATA,
 		}

diff --git a/images/virtualization-artifact/pkg/controller/service/attachment_service.go b/images/virtualization-artifact/pkg/controller/service/attachment_service.go
@@ -150,6 +150,7 @@ func (s AttachmentService) HotPlugDisk(ctx context.Context, ad *AttachmentDisk,
 		Name:       ad.GenerateName,
 		Image:      ad.Image,
 		PVCName:    ad.PVCName,
+		IsCdrom:    ad.IsCdrom,
 	})
 }
 
@@ -275,6 +276,7 @@ type AttachmentDisk struct {
 	GenerateName string
 	PVCName      string
 	Image        string
+	IsCdrom      bool
 }
 
 func NewAttachmentDiskFromVirtualDisk(vd *virtv2.VirtualDisk) *AttachmentDisk {
@@ -293,6 +295,7 @@ func NewAttachmentDiskFromVirtualImage(vi *virtv2.VirtualImage) *AttachmentDisk
 		Name:         vi.GetName(),
 		Namespace:    vi.GetNamespace(),
 		GenerateName: kvbuilder.GenerateVMIDiskName(vi.GetName()),
+		IsCdrom:      vi.Status.CDROM,
 	}
 
 	if vi.Spec.Storage == virtv2.StorageContainerRegistry {
@@ -310,5 +313,6 @@ func NewAttachmentDiskFromClusterVirtualImage(cvi *virtv2.ClusterVirtualImage) *
 		Name:         cvi.GetName(),
 		GenerateName: kvbuilder.GenerateCVMIDiskName(cvi.GetName()),
 		Image:        cvi.Status.Target.RegistryURL,
+		IsCdrom:      cvi.Status.CDROM,
 	}
 }