feat(api): typed Node.Spec.SatelliteEndpoint (Phase 10.3 step)

Replaces the upstream-LINSTOR-shaped `Spec.Props["SatelliteEndpoint"]`
with a typed Node.Spec.SatelliteEndpoint string field. The
dispatcher's lookupEndpoint now reads typed first and falls back
to the legacy Props key — a partially-migrated cluster (or a
satellite Hello that still pushes the prop) keeps working.

The k8s store transcodes both ways: wireToCRDNodeSpec lifts the
incoming Props key into the typed slot on Create/Update;
crdToWireNode re-emits it back into Props on GET so golinstor
sees the unchanged shape.

The whole field becomes irrelevant once Phase 10.6 lands and the
satellite gRPC dial is gone — but until then this kills one more
PropsContainers anti-pattern site.

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

Author: kvaps

api/v1alpha1/node_types.go

@@ -48,6 +48,15 @@ type NodeSpec struct {
 	// The first interface is treated as the satellite endpoint.
 	// +optional
 	NetInterfaces []NodeNetInterface `json:"netInterfaces,omitempty"`
+
+	// satelliteEndpoint is the controller→satellite gRPC endpoint
+	// (`host:port`). Phase 10.3: replaces `Props["SatelliteEndpoint"]`
+	// — the dispatcher reads this typed field first, falling back to
+	// the props bag for forward-compat with pre-migration data. The
+	// field becomes irrelevant once Phase 10.6 lands and the gRPC
+	// path is gone.
+	// +optional
+	SatelliteEndpoint string `json:"satelliteEndpoint,omitempty"`
 }
 
 // NodeNetInterface is one advertised endpoint of a satellite.

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

@@ -84,6 +84,15 @@ spec:
                   props is the LINSTOR property map for this node. Keys are LINSTOR
                   namespace paths (e.g. `Aux/foo`, `DrbdOptions/Net/...`).
                 type: object
+              satelliteEndpoint:
+                description: |-
+                  satelliteEndpoint is the controller→satellite gRPC endpoint
+                  (`host:port`). Phase 10.3: replaces `Props["SatelliteEndpoint"]`
+                  — the dispatcher reads this typed field first, falling back to
+                  the props bag for forward-compat with pre-migration data. The
+                  field becomes irrelevant once Phase 10.6 lands and the gRPC
+                  path is gone.
+                type: string
               type:
                 description: |-
                   type is the LINSTOR node role. Common values: SATELLITE, COMBINED,

pkg/dispatcher/dispatcher.go

@@ -141,15 +141,24 @@ func (d *Dispatcher) Apply(ctx context.Context, target *blockstoriov1alpha1.Reso
 	return resp.GetResults()[0], nil
 }
 
-// lookupEndpoint reads SatelliteEndpoint from the Node prop bag. We
-// match by the original LINSTOR name (annotation when slugified, else
-// metadata.Name) so non-RFC1123 LINSTOR names still resolve back to
-// the right CRD on the controller side.
+// lookupEndpoint reads SatelliteEndpoint from the matching Node CRD.
+// Phase 10.3: typed `Spec.SatelliteEndpoint` wins; falls back to the
+// legacy `Spec.Props["SatelliteEndpoint"]` so a partially-migrated
+// cluster (or a satellite that still pushes the prop in its Hello
+// handshake) keeps working unchanged. Match by the original LINSTOR
+// name (annotation when slugified, else metadata.Name) so
+// non-RFC1123 LINSTOR names still resolve back to the right CRD.
 func lookupEndpoint(nodeName string, nodes []blockstoriov1alpha1.Node) string {
 	for i := range nodes {
-		if k8s.OriginalName(&nodes[i].ObjectMeta) == nodeName {
-			return nodes[i].Spec.Props["SatelliteEndpoint"]
+		if k8s.OriginalName(&nodes[i].ObjectMeta) != nodeName {
+			continue
+		}
+
+		if ep := nodes[i].Spec.SatelliteEndpoint; ep != "" {
+			return ep
 		}
+
+		return nodes[i].Spec.Props["SatelliteEndpoint"]
 	}
 
 	return ""

pkg/store/k8s/nodes.go

@@ -18,6 +18,7 @@ package k8s
 
 import (
 	"context"
+	"maps"
 	"sort"
 	"strings"
 
@@ -164,11 +165,25 @@ func (n *nodes) Delete(ctx context.Context, name string) error {
 }
 
 // crdToWireNode flattens a Node CRD into the LINSTOR REST shape.
+// Phase 10.3: re-emits typed `Spec.SatelliteEndpoint` back into the
+// wire `Props["SatelliteEndpoint"]` so golinstor + the dispatcher's
+// fallback path keep seeing the same shape on GET.
 func crdToWireNode(crd *crdv1alpha1.Node) apiv1.Node {
+	props := crd.Spec.Props
+
+	if crd.Spec.SatelliteEndpoint != "" {
+		props = maps.Clone(props)
+		if props == nil {
+			props = map[string]string{}
+		}
+
+		props["SatelliteEndpoint"] = crd.Spec.SatelliteEndpoint
+	}
+
 	out := apiv1.Node{
 		Name:             OriginalName(&crd.ObjectMeta),
 		Type:             crd.Spec.Type,
-		Props:            crd.Spec.Props,
+		Props:            props,
 		ConnectionStatus: crd.Status.ConnectionStatus,
 	}
 
@@ -211,11 +226,18 @@ func wireToCRDNode(in *apiv1.Node) *crdv1alpha1.Node {
 // SatelliteEncryptionType is uppercased on the way in: upstream LINSTOR
 // accepts mixed case ("plain"/"PLAIN") but the CRD validation enum is
 // uppercase-only, so we normalise here to keep wire compatibility.
+//
+// Phase 10.3: lifts `Props["SatelliteEndpoint"]` into the typed
+// `Spec.SatelliteEndpoint` field. The dispatcher reads typed first
+// (so this is the source of truth going forward); we still keep the
+// original key in Props for forward-compat with any pre-migration
+// reader that hasn't been updated.
 func wireToCRDNodeSpec(in *apiv1.Node) crdv1alpha1.NodeSpec {
 	spec := crdv1alpha1.NodeSpec{
-		Type:  strings.ToUpper(in.Type),
-		Props: in.Props,
-		Flags: in.Flags,
+		Type:              strings.ToUpper(in.Type),
+		Props:             in.Props,
+		Flags:             in.Flags,
+		SatelliteEndpoint: in.Props["SatelliteEndpoint"],
 	}
 
 	if len(in.NetInterfaces) > 0 {