feat(api): typed Resource.Spec.StoragePool (Phase 10.3 step)

Replaces Spec.Props["StorPoolName"] with a typed
Resource.Spec.StoragePool string field. Dispatcher's buildVolumes
and the autoplacer dispatch path read typed first; legacy Props
fallback covers pre-migration data and any reader still looking
at the old key.

Auto-diskful promotion in ResourceReconciler now stamps both the
typed field (source of truth) and the legacy Props key (forward-
compat). The k8s store's wireToCRDResourceSpec lifts the wire
Props["StorPoolName"] into the typed slot on Create/Update;
crdToWireResource re-emits it back into Props on GET so golinstor
keeps seeing the unchanged shape.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

Author: kvaps

api/v1alpha1/resource_types.go

@@ -54,6 +54,13 @@ type ResourceSpec struct {
 	// +optional
 	ExtraProps map[string]string `json:"extraProps,omitempty"`
 
+	// storagePool is the LINSTOR storage pool name this replica
+	// allocates from. Replaces `Spec.Props["StorPoolName"]` (which
+	// the dispatcher's buildVolumes already prefers when set).
+	// Phase 10.3 step.
+	// +optional
+	StoragePool string `json:"storagePool,omitempty"`
+
 	// volumes carries per-volume seed configuration that the
 	// satellite applies once on first activation of this replica.
 	// Today the only field is SeedFromGi (Phase 8.1) — when set,

config/crd/bases/blockstor.io.blockstor.io_resources.yaml

@@ -229,6 +229,13 @@ spec:
               resourceDefinitionName:
                 description: resourceDefinitionName is the parent ResourceDefinition.
                 type: string
+              storagePool:
+                description: |-
+                  storagePool is the LINSTOR storage pool name this replica
+                  allocates from. Replaces `Spec.Props["StorPoolName"]` (which
+                  the dispatcher's buildVolumes already prefers when set).
+                  Phase 10.3 step.
+                type: string
               volumes:
                 description: |-
                   volumes carries per-volume seed configuration that the

internal/controller/resource_controller.go

@@ -224,6 +224,11 @@ func (r *ResourceReconciler) maybeAutoDiskful(ctx context.Context, target *block
 	target.Spec.Flags = slices.DeleteFunc(target.Spec.Flags,
 		func(s string) bool { return s == apiv1.ResourceFlagDiskless })
 
+	// Phase 10.3 step: prefer typed Spec.StoragePool. Keep the
+	// legacy Props key in sync for forward-compat with any reader
+	// that hasn't migrated.
+	target.Spec.StoragePool = pool
+
 	if target.Spec.Props == nil {
 		target.Spec.Props = map[string]string{}
 	}

pkg/dispatcher/dispatcher.go

@@ -419,7 +419,18 @@ func buildVolumes(rd *blockstoriov1alpha1.ResourceDefinition, target *blockstori
 		return nil
 	}
 
-	pool := target.Spec.Props["StorPoolName"]
+	// Phase 10.3 step: typed `Spec.StoragePool` wins over the legacy
+	// `Spec.Props["StorPoolName"]` so we don't read stale data when
+	// the controller has already migrated. RD-level fallback still
+	// goes through Props since RD has no typed slot for the pool
+	// name (it lives on a per-volume VG.Props in
+	// ResourceGroupVolumeGroup; the RD-prop fallback is the legacy
+	// shim).
+	pool := target.Spec.StoragePool
+	if pool == "" {
+		pool = target.Spec.Props["StorPoolName"]
+	}
+
 	if pool == "" {
 		pool = rd.Spec.Props["StorPoolName"]
 	}
@@ -471,7 +482,11 @@ func (d *Dispatcher) DeleteResource(ctx context.Context, target *blockstoriov1al
 
 	defer func() { _ = closer() }()
 
-	pool := target.Spec.Props["StorPoolName"]
+	pool := target.Spec.StoragePool
+	if pool == "" {
+		pool = target.Spec.Props["StorPoolName"]
+	}
+
 	if pool == "" && rd != nil {
 		pool = rd.Spec.Props["StorPoolName"]
 	}

pkg/store/k8s/resources.go

@@ -253,6 +253,17 @@ func mergeVolumeObservations(dst *[]crdv1alpha1.ResourceVolumeStatus, observatio
 func crdToWireResource(crd *crdv1alpha1.Resource) apiv1.Resource {
 	props := mergeProps(crd.Spec.Props, typedToProps(crd.Spec.DRBDOptions, crd.Spec.ExtraProps))
 
+	// Phase 10.3 step: re-emit typed StoragePool back into Props
+	// so golinstor + the dispatcher's legacy fallback see the
+	// upstream-compatible shape on GET.
+	if crd.Spec.StoragePool != "" {
+		if props == nil {
+			props = map[string]string{}
+		}
+
+		props["StorPoolName"] = crd.Spec.StoragePool
+	}
+
 	return apiv1.Resource{
 		Name:     crd.Spec.ResourceDefinitionName,
 		NodeName: crd.Spec.NodeName,
@@ -290,5 +301,10 @@ func wireToCRDResourceSpec(in *apiv1.Resource) crdv1alpha1.ResourceSpec {
 		DRBDOptions:            typed,
 		ExtraProps:             extras,
 		Flags:                  in.Flags,
+		// Phase 10.3 step: lift Props["StorPoolName"] into the
+		// typed slot. The legacy key stays in residual Props (it's
+		// non-DRBD, so stripDRBDProps left it alone) for forward-
+		// compat — readers still consulting Props will see it.
+		StoragePool: in.Props["StorPoolName"],
 	}
 }