Skip to content

Commit 828b5bc

Browse files
author
Roman Sysoev
committed
fix(vmbda): fix terminating status problem
Signed-off-by: Roman Sysoev <[email protected]>
1 parent 1a025d0 commit 828b5bc

File tree

7 files changed

+16
-329
lines changed

7 files changed

+16
-329
lines changed

images/virtualization-artifact/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ replace (
155155
k8s.io/client-go => k8s.io/client-go v0.33.3
156156
k8s.io/component-base => k8s.io/component-base v0.33.3
157157
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911
158+
kubevirt.io/api => github.com/deckhouse/3p-kubevirt-api v1.3.1-v12n.0
158159
)
159160

160161
// CVE Replaces

images/virtualization-artifact/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
4545
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4646
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
4747
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
48+
github.com/deckhouse/3p-kubevirt-api v1.3.1-v12n.0 h1:Tygrxudb159/H4ozBY+jvVhNWWGP6GYNYz8Hg8k2Sok=
49+
github.com/deckhouse/3p-kubevirt-api v1.3.1-v12n.0/go.mod h1:tCn7VAZktEvymk490iPSMPCmKM9UjbbfH2OsFR/IOLU=
4850
github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250226105106-176cd3afcdd5 h1:PsN1E0oxC/+4zdA977txrqUCuObFL3HAuu5Xnud8m8c=
4951
github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250226105106-176cd3afcdd5/go.mod h1:Mk5HRzkc5pIcDIZ2JJ6DPuuqnwhXVkb3you8M8Mg+4w=
5052
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
@@ -643,8 +645,6 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt
643645
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
644646
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
645647
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
646-
kubevirt.io/api v1.3.1 h1:MoTNo/zvDlZ44c2ocXLPln8XTaQOeUodiYbEKrTCqv4=
647-
kubevirt.io/api v1.3.1/go.mod h1:tCn7VAZktEvymk490iPSMPCmKM9UjbbfH2OsFR/IOLU=
648648
kubevirt.io/containerized-data-importer-api v1.60.3 h1:kQEXi7scpzUa0RPf3/3MKk1Kmem0ZlqqiuK3kDF5L2I=
649649
kubevirt.io/containerized-data-importer-api v1.60.3/go.mod h1:8mwrkZIdy8j/LmCyKt2wFXbiMavLUIqDaegaIF67CZs=
650650
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 h1:QMrd0nKP0BGbnxTqakhDZAUhGKxPiPiN5gSDqKUmGGc=

images/virtualization-artifact/pkg/controller/kvapi/kvapi.go

Lines changed: 0 additions & 274 deletions
This file was deleted.

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ func (b *KVVM) SetDisk(name string, opts SetDiskOptions) error {
373373

374374
case opts.ContainerDisk != nil:
375375
vs.ContainerDisk = &virtv1.ContainerDiskSource{
376-
Image: *opts.ContainerDisk,
376+
Image: *opts.ContainerDisk,
377+
Hotpluggable: opts.IsHotplugged,
377378
}
378379

379380
case opts.Provisioning != nil:

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func ApplyVirtualMachineSpec(
133133
})
134134
}
135135

136-
if volume.ContainerDisk != nil && isHotplugged(volume, vm, vmbdas) {
136+
if volume.ContainerDisk != nil && volume.ContainerDisk.Hotpluggable {
137137
hotpluggedDevices = append(hotpluggedDevices, HotPlugDeviceSettings{
138138
VolumeName: volume.Name,
139139
Image: volume.ContainerDisk.Image,
@@ -321,15 +321,3 @@ func setNetworksAnnotation(kvvm *KVVM, networkSpec network.InterfaceSpecList) er
321321
kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)
322322
return nil
323323
}
324-
325-
func isHotplugged(volume virtv1.Volume, vm *v1alpha2.VirtualMachine, vmbdas map[v1alpha2.VMBDAObjectRef][]*v1alpha2.VirtualMachineBlockDeviceAttachment) bool {
326-
name, kind := GetOriginalDiskName(volume.Name)
327-
for _, bdRef := range vm.Spec.BlockDeviceRefs {
328-
if bdRef.Name == name && bdRef.Kind == kind {
329-
return false
330-
}
331-
}
332-
333-
_, ok := vmbdas[v1alpha2.VMBDAObjectRef{Name: name, Kind: v1alpha2.VMBDAObjectRefKind(kind)}]
334-
return ok
335-
}

0 commit comments

Comments
 (0)