Skip to content
Open
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
2 changes: 2 additions & 0 deletions api/core/v1alpha2/vdcondition/condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ const (
DatasourceIsNotFound ReadyReason = "DatasourceIsNotFound"
// StorageClassIsNotReady indicates that Storage class is not ready.
StorageClassIsNotReady ReadyReason = "StorageClassIsNotReady"
// StorageClassNotMatchingSource indicates that the VirtualDisk storage class does not match the source storage class.
StorageClassNotMatchingSource ReadyReason = "StorageClassNotMatchingSource"

// InProgress indicates that the resize request has been detected and the operation is currently in progress.
InProgress ResizedReason = "InProgress"
Expand Down
30 changes: 30 additions & 0 deletions images/virtualization-artifact/pkg/common/vd/vd.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@ limitations under the License.
package vd

import (
"context"
"fmt"
"log/slog"

"k8s.io/apimachinery/pkg/types"
"k8s.io/component-base/featuregate"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/deckhouse/virtualization-controller/pkg/common/object"
"github.com/deckhouse/virtualization-controller/pkg/featuregates"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
)
Expand Down Expand Up @@ -68,3 +73,28 @@ func StorageClassChanged(vd *v1alpha2.VirtualDisk) bool {

return *specSc != "" && statusSc != ""
}

func ValidateVirtualImageStorageClassMatch(ctx context.Context, vd *v1alpha2.VirtualDisk, client client.Client) error {
if vd.Spec.DataSource == nil || vd.Spec.DataSource.Type != v1alpha2.DataSourceTypeObjectRef {
return nil
}

if vd.Spec.DataSource.ObjectRef == nil || vd.Spec.DataSource.ObjectRef.Kind != v1alpha2.VirtualDiskObjectRefKindVirtualImage {
return nil
}

vi, err := object.FetchObject(ctx, types.NamespacedName{Namespace: vd.Namespace, Name: vd.Spec.DataSource.ObjectRef.Name}, client, &v1alpha2.VirtualImage{})
if err != nil {
return err
}

if vi == nil || vi.Status.Phase != v1alpha2.ImageReady || vi.Spec.Storage == v1alpha2.StorageContainerRegistry {
return nil
}

if vi.Status.StorageClassName != vd.Status.StorageClassName {
return fmt.Errorf("virtual disk storage class %q does not match virtual image storage class %q", vd.Status.StorageClassName, vi.Status.StorageClassName)
}

return nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
"github.com/deckhouse/virtualization-controller/pkg/controller/service"
"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/source"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
Expand Down Expand Up @@ -126,7 +128,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *v1alpha2.VirtualDisk)
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.StorageClassIsNotReady).
Message("Storage class in not ready")
Message("Storage class is not ready.")
conditions.SetCondition(cb, &vd.Status.Conditions)

return reconcile.Result{}, nil
Expand All @@ -135,6 +137,17 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *v1alpha2.VirtualDisk)
if vd.Status.StorageClassName == "" {
return reconcile.Result{}, fmt.Errorf("empty storage class in status")
}

err := commonvd.ValidateVirtualImageStorageClassMatch(ctx, vd, h.client)
if err != nil {
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.StorageClassNotMatchingSource).
Message(service.CapitalizeFirstLetter(err.Error()))
conditions.SetCondition(cb, &vd.Status.Conditions)

return reconcile.Result{}, nil
}
}

var ds source.Handler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
Expand Down Expand Up @@ -289,6 +292,112 @@ var _ = Describe("LifeCycleHandler Run", func() {
vdcondition.DatasourceIsNotFound.String(),
),
)

It("should handle a VirtualDisk without data source", func() {
var sourcesMock SourcesMock
recorder := &eventrecord.EventRecorderLoggerMock{
EventFunc: func(_ client.Object, _, _, _ string) {},
}
ctx := logger.ToContext(context.TODO(), testutil.NewNoOpSlogLogger())
syncCalled := false
blank := &source.HandlerMock{
SyncFunc: func(_ context.Context, _ *v1alpha2.VirtualDisk) (reconcile.Result, error) {
syncCalled = true
return reconcile.Result{}, nil
},
}
vd := v1alpha2.VirtualDisk{
Status: v1alpha2.VirtualDiskStatus{
StorageClassName: "vd-sc",
Conditions: []metav1.Condition{
{
Type: vdcondition.DatasourceReadyType.String(),
Status: metav1.ConditionTrue,
},
{
Type: vdcondition.StorageClassReadyType.String(),
Status: metav1.ConditionTrue,
},
},
},
}

sourcesMock.ChangedFunc = func(_ context.Context, _ *v1alpha2.VirtualDisk) bool {
return false
}
handler := NewLifeCycleHandler(recorder, blank, &sourcesMock, nil)

Expect(func() {
_, _ = handler.Handle(ctx, &vd)
}).NotTo(Panic())
Expect(syncCalled).To(BeTrue())
})

It("should set a dedicated reason when storage class does not match the source virtual image", func() {
scheme := runtime.NewScheme()
Expect(v1alpha2.AddToScheme(scheme)).To(Succeed())
Expect(storagev1.AddToScheme(scheme)).To(Succeed())

vi := &v1alpha2.VirtualImage{
ObjectMeta: metav1.ObjectMeta{
Name: "source-vi",
Namespace: "default",
},
Spec: v1alpha2.VirtualImageSpec{
Storage: v1alpha2.StoragePersistentVolumeClaim,
},
Status: v1alpha2.VirtualImageStatus{
Phase: v1alpha2.ImageReady,
StorageClassName: "vi-sc",
},
}

k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vi).Build()
var sourcesMock SourcesMock
sourcesMock.ChangedFunc = func(_ context.Context, _ *v1alpha2.VirtualDisk) bool {
return false
}
recorder := &eventrecord.EventRecorderLoggerMock{
EventFunc: func(_ client.Object, _, _, _ string) {},
}
ctx := logger.ToContext(context.TODO(), testutil.NewNoOpSlogLogger())
vd := v1alpha2.VirtualDisk{
ObjectMeta: metav1.ObjectMeta{
Namespace: "default",
},
Spec: v1alpha2.VirtualDiskSpec{
DataSource: &v1alpha2.VirtualDiskDataSource{
Type: v1alpha2.DataSourceTypeObjectRef,
ObjectRef: &v1alpha2.VirtualDiskObjectRef{
Kind: v1alpha2.VirtualDiskObjectRefKindVirtualImage,
Name: vi.Name,
},
},
},
Status: v1alpha2.VirtualDiskStatus{
StorageClassName: "vd-sc",
Conditions: []metav1.Condition{
{
Type: vdcondition.DatasourceReadyType.String(),
Status: metav1.ConditionTrue,
},
{
Type: vdcondition.StorageClassReadyType.String(),
Status: metav1.ConditionTrue,
},
},
},
}

handler := NewLifeCycleHandler(recorder, &source.HandlerMock{}, &sourcesMock, k8sClient)
_, err := handler.Handle(ctx, &vd)
Expect(err).NotTo(HaveOccurred())

readyCond, ok := conditions.GetCondition(vdcondition.ReadyType, vd.Status.Conditions)
Expect(ok).To(BeTrue())
Expect(readyCond.Reason).To(Equal(vdcondition.StorageClassNotMatchingSource.String()))
Expect(readyCond.Message).To(Equal(`Virtual disk storage class "vd-sc" does not match virtual image storage class "vi-sc"`))
})
})

type cleanupAfterSpecChangeTestArgs struct {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
Copyright 2026 Flant JSC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package validator

import (
"context"
"errors"
"fmt"

"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
"github.com/deckhouse/virtualization-controller/pkg/controller/service"
intsvc "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/service"
"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/source"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)

type VirtualImagePVCStorageClassValidator struct {
client client.Client
scService *intsvc.VirtualDiskStorageClassService
}

func NewVirtualImagePVCStorageClassValidator(client client.Client, scService *intsvc.VirtualDiskStorageClassService) *VirtualImagePVCStorageClassValidator {
return &VirtualImagePVCStorageClassValidator{
client: client,
scService: scService,
}
}

func (v *VirtualImagePVCStorageClassValidator) ValidateCreate(ctx context.Context, vd *v1alpha2.VirtualDisk) (admission.Warnings, error) {
scName, err := v.extractVDStorageClassName(ctx, vd)
if err != nil {
return nil, err
}

vdWithStatusStorageClassName := vd.DeepCopy()
vdWithStatusStorageClassName.Status.StorageClassName = scName

return nil, commonvd.ValidateVirtualImageStorageClassMatch(ctx, vdWithStatusStorageClassName, v.client)
}

func (v *VirtualImagePVCStorageClassValidator) ValidateUpdate(ctx context.Context, _, newVD *v1alpha2.VirtualDisk) (admission.Warnings, error) {
ready, _ := conditions.GetCondition(vdcondition.ReadyType, newVD.Status.Conditions)
if source.IsDiskProvisioningFinished(ready) {
return nil, nil
}

return nil, commonvd.ValidateVirtualImageStorageClassMatch(ctx, newVD, v.client)
}

func (v *VirtualImagePVCStorageClassValidator) extractVDStorageClassName(ctx context.Context, vd *v1alpha2.VirtualDisk) (string, error) {
if vd.Status.StorageClassName != "" {
return vd.Status.StorageClassName, nil
}

if vd.Spec.PersistentVolumeClaim.StorageClass != nil {
return *vd.Spec.PersistentVolumeClaim.StorageClass, nil
}

moduleStorageClass, err := v.scService.GetModuleStorageClass(ctx)
if err != nil {
return "", err
}

if moduleStorageClass != nil {
return moduleStorageClass.Name, nil
}

defaultStorageClass, err := v.scService.GetDefaultStorageClass(ctx)
if err != nil && !errors.Is(err, service.ErrDefaultStorageClassNotFound) {
return "", err
}

if defaultStorageClass != nil {
return defaultStorageClass.Name, nil
}

return "", fmt.Errorf("storage class for VirtualDisk %q cannot be determined", vd.Name)
}
Loading
Loading