Skip to content

Fix fetch VM with version v1alpha4 #3696

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

Fix fetch VM with version v1alpha4 #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pkg/common/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ func GetVirtualMachineAllApiVersions(ctx context.Context, vmKey types.Namespaced
log.Debugf("GetVirtualMachineAllApiVersions: converting v1alpha4 VirtualMachine "+
"to v1alpha5 VirtualMachine, name %s", vmV1alpha4.Name)
apiVersion = vmOperatorApiVersionPrefix + "/v1alpha4"
err = vmoperatorv1alpha4.Convert_v1alpha5_VirtualMachine_To_v1alpha4_VirtualMachine(
vm, vmV1alpha4, nil)
err = vmoperatorv1alpha4.Convert_v1alpha4_VirtualMachine_To_v1alpha5_VirtualMachine(
vmV1alpha4, vm, nil)
if err != nil {
return nil, apiVersion, err
}
Expand All @@ -451,7 +451,7 @@ func PatchVirtualMachine(ctx context.Context, vmOperatorClient client.Client,
vmV1alpha2, old_vmV1alpha2 := &vmoperatorv1alpha2.VirtualMachine{}, &vmoperatorv1alpha2.VirtualMachine{}
vmV1alpha3, old_vmV1alpha3 := &vmoperatorv1alpha3.VirtualMachine{}, &vmoperatorv1alpha3.VirtualMachine{}
vmV1alpha4, old_vmV1alpha4 := &vmoperatorv1alpha4.VirtualMachine{}, &vmoperatorv1alpha4.VirtualMachine{}
log.Infof("PatchVirtualMachine: patch virtualmachine name: %s", vmV1alpha4.Name)
log.Infof("PatchVirtualMachine: patch virtualmachine name: %s", vm.Name)
// try patch virtualmachine with latest api version
vmPatch := client.MergeFromWithOptions(
old_vm.DeepCopy(),
Expand Down
3 changes: 2 additions & 1 deletion pkg/csi/service/wcpguest/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,8 @@ func controllerPublishForBlockVolume(ctx context.Context, req *csi.ControllerPub
}
virtualMachine = &vmoperatorv1alpha5.VirtualMachine{}
}

log.Infof("check if volume attached to virtualmachine name %s, namespace %s",
virtualMachine.Name, virtualMachine.Namespace)
for _, volume := range virtualMachine.Status.Volumes {
if volume.Name == req.VolumeId && volume.Attached && volume.DiskUUID != "" {
diskUUID = volume.DiskUUID
Expand Down