fix(vm): fix vm pod placement for local disks with hotplug volumes (#2363)

Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>

Author: eofff

images/virtualization-artifact/pkg/common/vd/vd.go

@@ -18,6 +18,7 @@ package vd
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 
@@ -27,6 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
@@ -75,6 +77,53 @@ func StorageClassChanged(vd *v1alpha2.VirtualDisk) bool {
 	return *specSc != "" && statusSc != ""
 }
 
+type VirtualDiskStorageClassResolver interface {
+	GetModuleStorageClass(ctx context.Context) (*storagev1.StorageClass, error)
+	GetDefaultStorageClass(ctx context.Context) (*storagev1.StorageClass, error)
+}
+
+// ResolveStorageClassName resolves storage class name for a VirtualDisk
+// with the same precedence as VD handlers:
+// 1. vd.Status.StorageClassName
+// 2. vd.Spec.PersistentVolumeClaim.StorageClass
+// 3. module default storage class (if resolver is provided)
+// 4. cluster default storage class (if resolver is provided)
+func ResolveStorageClassName(ctx context.Context, vd *v1alpha2.VirtualDisk, resolver VirtualDiskStorageClassResolver) (string, error) {
+	if vd == nil {
+		return "", nil
+	}
+
+	if vd.Status.StorageClassName != "" {
+		return vd.Status.StorageClassName, nil
+	}
+
+	if vd.Spec.PersistentVolumeClaim.StorageClass != nil && *vd.Spec.PersistentVolumeClaim.StorageClass != "" {
+		return *vd.Spec.PersistentVolumeClaim.StorageClass, nil
+	}
+
+	if resolver == nil {
+		return "", nil
+	}
+
+	moduleStorageClass, err := resolver.GetModuleStorageClass(ctx)
+	if err != nil {
+		return "", err
+	}
+	if moduleStorageClass != nil {
+		return moduleStorageClass.Name, nil
+	}
+
+	defaultStorageClass, err := resolver.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)
+}
+
 func ValidateVirtualImageStorageClassProvisionerCompatibility(ctx context.Context, vd *v1alpha2.VirtualDisk, client client.Client) error {
 	if vd.Spec.DataSource == nil || vd.Spec.DataSource.Type != v1alpha2.DataSourceTypeObjectRef {
 		return nil

images/virtualization-artifact/pkg/controller/indexer/indexer.go

@@ -71,6 +71,7 @@ const (
 
 	IndexFieldEventByInvolvedObjectName        = "involvedObject.name"
 	IndexFieldEventByInvolvedObjectKind        = "involvedObject.kind"
+	IndexFieldPVByStorageClass                 = "spec.storageClassName"
 	IndexFieldUSBDeviceByName                  = "metadata.name"
 	IndexFieldNodeUSBDeviceByAssignedNamespace = "spec.assignedNamespace"
 
@@ -104,6 +105,7 @@ var IndexGetters = []IndexGetter{
 	IndexVMIPLeaseByVMIP,
 	IndexEventByInvolvedObjectName,
 	IndexEventByInvolvedObjectKind,
+	IndexPVByStorageClass,
 }
 
 var IndexGettersUSB = []IndexGetter{

images/virtualization-artifact/pkg/controller/indexer/pv_indexer.go

@@ -0,0 +1,32 @@
+/*
+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 indexer
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func IndexPVByStorageClass() (obj client.Object, field string, extractValue client.IndexerFunc) {
+	return &corev1.PersistentVolume{}, IndexFieldPVByStorageClass, func(object client.Object) []string {
+		pv, ok := object.(*corev1.PersistentVolume)
+		if !ok || pv == nil || pv.Spec.StorageClassName == "" {
+			return nil
+		}
+		return []string{pv.Spec.StorageClassName}
+	}
+}

images/virtualization-artifact/pkg/controller/vd/internal/validator/vi_pvc_storage_class_provisioner_compatibility_validator.go

@@ -18,16 +18,13 @@ package validator
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"reflect"
 
 	"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"
@@ -47,7 +44,7 @@ func NewVirtualImagePVCStorageClassValidator(client client.Client, scService *in
 }
 
 func (v *VirtualImagePVCStorageClassValidator) ValidateCreate(ctx context.Context, vd *v1alpha2.VirtualDisk) (admission.Warnings, error) {
-	scName, err := v.extractVDStorageClassName(ctx, vd)
+	scName, err := commonvd.ResolveStorageClassName(ctx, vd, v.scService)
 	if err != nil {
 		return nil, err
 	}
@@ -70,33 +67,3 @@ func (v *VirtualImagePVCStorageClassValidator) ValidateUpdate(ctx context.Contex
 
 	return nil, commonvd.ValidateVirtualImageStorageClassProvisionerCompatibility(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)
-}