Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ const (
virtualMachineKey = "vm"
virtualMachineBlockDeviceAttachmentKey = "vmbdas"
virtualMachineIPAddressKey = "vmip"
virtualMachineMACAddressesKey = "vmmacs"
provisionerKey = "provisioner"
)
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ func (r SecretRestorer) Store(ctx context.Context, vm *virtv2.VirtualMachine, vm
return nil, err
}

err = r.setVirtualMachineMACAddresses(ctx, &secret, vm)
if err != nil {
return nil, err
}

err = r.setProvisioning(ctx, &secret, vm)
if err != nil {
return nil, err
Expand Down Expand Up @@ -100,6 +105,26 @@ func (r SecretRestorer) RestoreVirtualMachineIPAddress(_ context.Context, secret
return get[*virtv2.VirtualMachineIPAddress](secret, virtualMachineIPAddressKey)
}

func (r SecretRestorer) RestoreVirtualMachineMACAddresses(_ context.Context, secret *corev1.Secret) ([]*virtv2.VirtualMachineMACAddress, error) {
return get[[]*virtv2.VirtualMachineMACAddress](secret, virtualMachineMACAddressesKey)
}

func (r SecretRestorer) RestoreMACAddressOrder(_ context.Context, secret *corev1.Secret) ([]string, error) {
vm, err := get[*virtv2.VirtualMachine](secret, virtualMachineKey)
if err != nil {
return nil, err
}

var macAddressOrder []string
for _, ns := range vm.Status.Networks {
if ns.Type == virtv2.NetworksTypeMain {
continue
}
macAddressOrder = append(macAddressOrder, ns.MAC)
}
return macAddressOrder, nil
}

func (r SecretRestorer) RestoreVirtualMachineBlockDeviceAttachments(_ context.Context, secret *corev1.Secret) ([]*virtv2.VirtualMachineBlockDeviceAttachment, error) {
return get[[]*virtv2.VirtualMachineBlockDeviceAttachment](secret, virtualMachineBlockDeviceAttachmentKey)
}
Expand Down Expand Up @@ -225,6 +250,38 @@ func (r SecretRestorer) setVirtualMachineIPAddress(ctx context.Context, secret *
return nil
}

func (r SecretRestorer) setVirtualMachineMACAddresses(ctx context.Context, secret *corev1.Secret, vm *virtv2.VirtualMachine) error {
var vmmacs []virtv2.VirtualMachineMACAddress
for _, ns := range vm.Status.Networks {
if ns.Type == virtv2.NetworksTypeMain {
continue
}

vmmac, err := object.FetchObject(ctx, types.NamespacedName{
Namespace: vm.Namespace,
Name: ns.VirtualMachineMACAddressName,
}, r.client, &virtv2.VirtualMachineMACAddress{})
if err != nil {
return err
}

if vmmac == nil {
return fmt.Errorf("the virtual machine mac address %q not found", ns.VirtualMachineMACAddressName)
}

vmmac.Spec.Address = vmmac.Status.Address
vmmacs = append(vmmacs, *vmmac)
}

JSON, err := json.Marshal(vmmacs)
if err != nil {
return err
}

secret.Data[virtualMachineMACAddressesKey] = []byte(base64.StdEncoding.EncodeToString(JSON))
return nil
}

func (r SecretRestorer) setProvisioning(ctx context.Context, secret *corev1.Secret, vm *virtv2.VirtualMachine) error {
var secretName string

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ type Restorer interface {
RestoreProvisioner(ctx context.Context, secret *corev1.Secret) (*corev1.Secret, error)
RestoreVirtualMachineIPAddress(ctx context.Context, secret *corev1.Secret) (*virtv2.VirtualMachineIPAddress, error)
RestoreVirtualMachineBlockDeviceAttachments(ctx context.Context, secret *corev1.Secret) ([]*virtv2.VirtualMachineBlockDeviceAttachment, error)
RestoreVirtualMachineMACAddresses(ctx context.Context, secret *corev1.Secret) ([]*virtv2.VirtualMachineMACAddress, error)
RestoreMACAddressOrder(ctx context.Context, secret *corev1.Secret) ([]string, error)
}
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,35 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vmRestore *virtv2.VirtualM
overrideValidators = append(overrideValidators, restorer.NewVirtualMachineIPAddressOverrideValidator(vmip, h.client, string(vmRestore.UID)))
}

vmmacs, err := h.restorer.RestoreVirtualMachineMACAddresses(ctx, restorerSecret)
if err != nil {
setPhaseConditionToFailed(cb, &vmRestore.Status.Phase, err)
return reconcile.Result{}, err
}

macAddressOrder, err := h.restorer.RestoreMACAddressOrder(ctx, restorerSecret)
if err != nil {
setPhaseConditionToFailed(cb, &vmRestore.Status.Phase, err)
return reconcile.Result{}, err
}

if len(vmmacs) > 0 {
macAddressNamesByAddress := make(map[string]string)
for _, vmmac := range vmmacs {
overrideValidators = append(overrideValidators, restorer.NewVirtualMachineMACAddressOverrideValidator(vmmac, h.client, string(vmRestore.UID)))
macAddressNamesByAddress[vmmac.Status.Address] = vmmac.Name
}

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

ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-1]]
}
}

overrideValidators = append(overrideValidators, restorer.NewVirtualMachineOverrideValidator(vm, h.client, string(vmRestore.UID)))

overridedVMName, err = h.getOverrridedVMName(overrideValidators)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading