From bd3ff9b58adf03416dc8273138cab6c756a5199a Mon Sep 17 00:00:00 2001 From: yaroslavborbat Date: Wed, 15 Jan 2025 18:25:07 +0300 Subject: [PATCH] fix Signed-off-by: yaroslavborbat --- .../patches/032-hotplug-container-disk.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/images/virt-artifact/patches/032-hotplug-container-disk.patch b/images/virt-artifact/patches/032-hotplug-container-disk.patch index bb4de2b7c3..164dcd5891 100644 --- a/images/virt-artifact/patches/032-hotplug-container-disk.patch +++ b/images/virt-artifact/patches/032-hotplug-container-disk.patch @@ -301,20 +301,28 @@ index 490cc445ef..4b7dbc12fe 100644 } } diff --git a/pkg/virt-api/rest/subresource.go b/pkg/virt-api/rest/subresource.go -index b5d62f5af5..bf561f00ae 100644 +index b5d62f5af5..1df640888f 100644 --- a/pkg/virt-api/rest/subresource.go +++ b/pkg/virt-api/rest/subresource.go -@@ -1023,7 +1023,8 @@ func volumeSourceName(volumeSource *v1.HotplugVolumeSource) string { +@@ -1018,12 +1018,16 @@ func volumeSourceName(volumeSource *v1.HotplugVolumeSource) string { + if volumeSource.PersistentVolumeClaim != nil { + return volumeSource.PersistentVolumeClaim.ClaimName + } ++ if volumeSource.ContainerDisk != nil { ++ return volumeSource.ContainerDisk.Image ++ } + return "" + } func volumeSourceExists(volume v1.Volume, volumeName string) bool { return (volume.DataVolume != nil && volume.DataVolume.Name == volumeName) || - (volume.PersistentVolumeClaim != nil && volume.PersistentVolumeClaim.ClaimName == volumeName) + (volume.PersistentVolumeClaim != nil && volume.PersistentVolumeClaim.ClaimName == volumeName) || -+ (volume.ContainerDisk != nil && volume.ContainerDisk.Image != "") ++ (volume.ContainerDisk != nil && volume.ContainerDisk.Image == volumeName) } func volumeExists(volume v1.Volume, volumeName string) bool { -@@ -1125,6 +1126,8 @@ func (app *SubresourceAPIApp) addVolumeRequestHandler(request *restful.Request, +@@ -1125,6 +1129,8 @@ func (app *SubresourceAPIApp) addVolumeRequestHandler(request *restful.Request, opts.VolumeSource.DataVolume.Hotpluggable = true } else if opts.VolumeSource.PersistentVolumeClaim != nil { opts.VolumeSource.PersistentVolumeClaim.Hotpluggable = true