Skip to content
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.

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

fix(vi): fix panic when creating vi from vd #384

Merged
merged 7 commits into from
Sep 19, 2024
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 @@ -122,18 +122,23 @@ func (s DiskService) Start(
func (s DiskService) StartImmediate(
ctx context.Context,
pvcSize resource.Quantity,
storageClass string,
storageClass *string,
source *cdiv1.DataVolumeSource,
obj ObjectKind,
sup *supplements.Generator,
) error {
sc, err := s.GetStorageClass(ctx, storageClass)
if err != nil {
return err
}

dvBuilder := kvbuilder.NewDV(sup.DataVolume())
dvBuilder.SetDataSource(source)
dvBuilder.SetPVC(&storageClass, pvcSize, corev1.ReadWriteMany, corev1.PersistentVolumeBlock)
dvBuilder.SetOwnerRef(obj, obj.GroupVersionKind())
dvBuilder.SetPVC(ptr.To(sc.GetName()), pvcSize, corev1.ReadWriteMany, corev1.PersistentVolumeBlock)
dvBuilder.SetImmediate()

err := s.client.Create(ctx, dvBuilder.GetResource())
err = s.client.Create(ctx, dvBuilder.GetResource())
if err != nil && !k8serrors.IsAlreadyExists(err) {
return err
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, vd *virtv2.Virtua
},
}

err = ds.diskService.StartImmediate(ctx, size, *vd.Spec.PersistentVolumeClaim.StorageClass, source, vd, supgen)
if err != nil {
err = ds.diskService.Start(ctx, size, vd.Spec.PersistentVolumeClaim.StorageClass, source, vd, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vd, condition); err != nil || updated {
return false, err
}

Expand Down Expand Up @@ -140,7 +140,7 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, vd *virtv2.Virtua
return false, err
}

sc, err := ds.diskService.GetStorageClass(ctx, pvc.Spec.StorageClassName)
sc, err := ds.diskService.GetStorageClass(ctx, vd.Spec.PersistentVolumeClaim.StorageClass)
if err != nil {
return false, err
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"

"github.com/deckhouse/virtualization-controller/pkg/common"
Expand Down Expand Up @@ -278,14 +279,8 @@ func (ds HTTPDataSource) StoreToPVC(ctx context.Context, vi *virtv2.VirtualImage
}

source := ds.getSource(supgen, ds.statService.GetDVCRImageName(pod))
sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
if err != nil {
setPhaseConditionToFailed(&condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, diskSize, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, diskSize, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, &condition); err != nil || updated {
return false, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -177,14 +178,8 @@ func (ds ObjectRefDataSource) StoreToPVC(ctx context.Context, vi *virtv2.Virtual
return false, err
}

sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
if err != nil {
setPhaseConditionToFailed(&condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, diskSize, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, diskSize, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, &condition); err != nil || updated {
return false, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import (
"errors"
"fmt"

"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -177,7 +179,7 @@ func (ds ObjectRefVirtualDisk) StoreToDVCR(ctx context.Context, vi *virtv2.Virtu
}

func (ds ObjectRefVirtualDisk) StoreToPVC(ctx context.Context, vi *virtv2.VirtualImage, vdRef *virtv2.VirtualDisk, condition *metav1.Condition) (bool, error) {
log, _ := logger.GetDataSourceContext(ctx, objectRefDataSource)
log, ctx := logger.GetDataSourceContext(ctx, objectRefDataSource)

supgen := supplements.NewGenerator(common.VIShortName, vi.Name, vi.Namespace, vi.UID)
dv, err := ds.diskService.GetDataVolume(ctx, supgen)
Expand Down Expand Up @@ -223,14 +225,13 @@ func (ds ObjectRefVirtualDisk) StoreToPVC(ctx context.Context, vi *virtv2.Virtua
},
}

sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
size, err := resource.ParseQuantity(vdRef.Status.Capacity)
if err != nil {
setPhaseConditionToFailed(condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, *vdRef.Spec.PersistentVolumeClaim.Size, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, size, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, condition); err != nil || updated {
return false, err
}

Expand All @@ -255,8 +256,8 @@ func (ds ObjectRefVirtualDisk) StoreToPVC(ctx context.Context, vi *virtv2.Virtua
condition.Message = ""

var imageStatus virtv2.ImageStatusSize
imageStatus.Stored = vdRef.Spec.PersistentVolumeClaim.Size.String()
imageStatus.Unpacked = vdRef.Spec.PersistentVolumeClaim.Size.String()
imageStatus.Stored = vdRef.Status.Capacity
imageStatus.Unpacked = vdRef.Status.Capacity
vi.Status.Size = imageStatus

vi.Status.Format = imageformat.FormatRAW
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -223,14 +224,8 @@ func (ds ObjectRefDataVirtualImageOnPVC) StoreToPVC(ctx context.Context, vi, viR
},
}

sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
if err != nil {
setPhaseConditionToFailed(condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, size, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, size, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, condition); err != nil || updated {
return false, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -182,14 +183,9 @@ func (ds RegistryDataSource) StoreToPVC(ctx context.Context, vi *virtv2.VirtualI
}

source := ds.getSource(supgen, ds.statService.GetDVCRImageName(pod))
sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
if err != nil {
setPhaseConditionToFailed(&condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, diskSize, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, diskSize, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, &condition); err != nil || updated {
return false, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,30 @@ func setPhaseConditionFromPodError(ready *metav1.Condition, vi *virtv2.VirtualIm
return err
}
}

func setPhaseConditionFromStorageError(err error, vi *virtv2.VirtualImage, condition *metav1.Condition) (bool, error) {
switch {
case err == nil:
return false, nil
case errors.Is(err, service.ErrStorageProfileNotFound):
vi.Status.Phase = virtv2.ImageFailed
condition.Status = metav1.ConditionFalse
condition.Reason = vicondition.ProvisioningFailed
condition.Message = "StorageProfile not found in the cluster: Please check a StorageClass name in the cluster or set a default StorageClass."
return true, nil
case errors.Is(err, service.ErrStorageClassNotFound):
vi.Status.Phase = virtv2.ImageFailed
condition.Status = metav1.ConditionFalse
condition.Reason = vicondition.ProvisioningFailed
condition.Message = "Provided StorageClass not found in the cluster."
return true, nil
case errors.Is(err, service.ErrDefaultStorageClassNotFound):
vi.Status.Phase = virtv2.ImageFailed
condition.Status = metav1.ConditionFalse
condition.Reason = vicondition.ProvisioningFailed
condition.Message = "Default StorageClass not found in the cluster: please provide a StorageClass name or set a default StorageClass."
return true, nil
default:
return false, err
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"

cc "github.com/deckhouse/virtualization-controller/pkg/common"
Expand Down Expand Up @@ -203,14 +204,9 @@ func (ds UploadDataSource) StoreToPVC(ctx context.Context, vi *virtv2.VirtualIma
}

source := ds.getSource(supgen, ds.statService.GetDVCRImageName(pod))
sc, err := ds.diskService.GetStorageClass(ctx, &ds.storageClassForPVC)
if err != nil {
setPhaseConditionToFailed(&condition, &vi.Status.Phase, err)
return false, err
}

err = ds.diskService.StartImmediate(ctx, diskSize, sc.GetName(), source, vi, supgen)
if err != nil {
err = ds.diskService.StartImmediate(ctx, diskSize, ptr.To(ds.storageClassForPVC), source, vi, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vi, &condition); err != nil || updated {
return false, err
}

Expand Down
Loading