diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go index 56a1ecb045..92fef19ba9 100644 --- a/pkg/common/utils/utils.go +++ b/pkg/common/utils/utils.go @@ -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 } @@ -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(), diff --git a/pkg/csi/service/wcpguest/controller.go b/pkg/csi/service/wcpguest/controller.go index a2dc6a787e..fa45a6c082 100644 --- a/pkg/csi/service/wcpguest/controller.go +++ b/pkg/csi/service/wcpguest/controller.go @@ -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