Skip to content

Commit cca40f2

Browse files
fix
Signed-off-by: yaroslavborbat <[email protected]>
1 parent 0aa99af commit cca40f2

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

images/virt-artifact/patches/032-hotplug-container-disk.patch

+10-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ index 10dbb92269..1ccc9e9fa7 100644
179179
- subresources.kubevirt.io
180180
resources:
181181
diff --git a/pkg/container-disk/container-disk.go b/pkg/container-disk/container-disk.go
182-
index 3251d04787..34affe841a 100644
182+
index 3251d04787..d86e466e8f 100644
183183
--- a/pkg/container-disk/container-disk.go
184184
+++ b/pkg/container-disk/container-disk.go
185185
@@ -47,8 +47,10 @@ var containerDiskOwner = "qemu"
@@ -228,6 +228,15 @@ index 3251d04787..34affe841a 100644
228228
// NewKernelBootSocketPathGetter get the socket pat of the kernel-boot containerDisk. For testing a baseDir
229229
// can be provided which can for instance point to /tmp.
230230
func NewKernelBootSocketPathGetter(baseDir string) KernelBootSocketPathGetter {
231+
@@ -278,7 +301,7 @@ func generateContainersHelper(vmi *v1.VirtualMachineInstance, config *virtconfig
232+
}
233+
234+
func generateContainerFromVolume(vmi *v1.VirtualMachineInstance, config *virtconfig.ClusterConfig, imageIDs map[string]string, podVolumeName, binVolumeName string, isInit, isKernelBoot bool, volume *v1.Volume, volumeIdx int) *kubev1.Container {
235+
- if volume.ContainerDisk == nil {
236+
+ if volume.ContainerDisk == nil || volume.ContainerDisk.Hotpluggable {
237+
return nil
238+
}
239+
231240
@@ -394,10 +417,37 @@ func CreateEphemeralImages(
232241
return nil
233242
}

0 commit comments

Comments
 (0)