Skip to content

fix(vmsnapshot): snapshotting vm without main network #2176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eofff wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(vmsnapshot): snapshotting vm without main network #2176

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
717c3c2
fix with vmop restore
Apr 9, 2026
007b844
vmrestore fix
Apr 9, 2026
d6cf08f
refactoring
Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions images/virtualization-artifact/pkg/controller/service/restorer/secret_restorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ func (r SecretRestorer) setVirtualMachineBlockDeviceAttachments(ctx context.Cont
}

func (r SecretRestorer) setVirtualMachineIPAddress(ctx context.Context, secret *corev1.Secret, vm *v1alpha2.VirtualMachine, keepIPAddress v1alpha2.KeepIPAddress) error {
if vm.Status.VirtualMachineIPAddress == "" {
return nil
}

vmip, err := object.FetchObject(ctx, types.NamespacedName{
Namespace: vm.Namespace,
Name: vm.Status.VirtualMachineIPAddress,
Expand Down
8 changes: 7 additions & 1 deletion images/virtualization-artifact/pkg/controller/service/restorer/snapshot_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,19 @@ func (r *SnapshotResources) Prepare(ctx context.Context) error {
macAddressNamesByAddress[vmmac.Status.Address] = vmmac.Name
}

hasMainNetwork := len(vm.Spec.Networks) > 0 && vm.Spec.Networks[0].Type == v1alpha2.NetworksTypeMain

for i := range vm.Spec.Networks {
ns := &vm.Spec.Networks[i]
if ns.Type == v1alpha2.NetworksTypeMain {
continue
}

ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-1]]
delta := 0
if hasMainNetwork {
delta = 1
}
ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-delta]]
}
} else {
for i := range vm.Spec.Networks {
Expand Down
7 changes: 6 additions & 1 deletion images/virtualization-artifact/pkg/controller/vmrestore/internal/life_cycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,18 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vmRestore *v1alpha2.Virtua
macAddressNamesByAddress[vmmac.Status.Address] = vmmac.Name
}

hasMainNetwork := len(vm.Spec.Networks) > 0 && vm.Spec.Networks[0].Type == v1alpha2.NetworksTypeMain
for i := range vm.Spec.Networks {
ns := &vm.Spec.Networks[i]
if ns.Type == v1alpha2.NetworksTypeMain {
continue
}

ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-1]]
delta := 0
if hasMainNetwork {
delta = 1
}
ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-delta]]
}
}

Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ func (h LifeCycleHandler) fillStatusResources(ctx context.Context, vmSnapshot *v
Name: vm.Name,
})

if vmSnapshot.Spec.KeepIPAddress == v1alpha2.KeepIPAddressAlways {
if vmSnapshot.Spec.KeepIPAddress == v1alpha2.KeepIPAddressAlways && vm.Status.VirtualMachineIPAddress != "" {
vmip, err := object.FetchObject(ctx, types.NamespacedName{
Namespace: vm.Namespace,
Name: vm.Status.VirtualMachineIPAddress,
Expand All @@ -787,7 +787,7 @@ func (h LifeCycleHandler) fillStatusResources(ctx context.Context, vmSnapshot *v
})
}

if len(vm.Spec.Networks) > 1 {
if len(vm.Spec.Networks) > 0 {
for _, ns := range vm.Status.Networks {
if ns.Type == v1alpha2.NetworksTypeMain {
continue
Expand Down
Loading