refactor(k8s-store): unify CRD composite-key separator on . (PhysicalDevice)

Other composite-key CRDs (StoragePool, Resource, Snapshot) all
name themselves `<key1>.<key2>` and route through `k8s.Name()`
for slug discipline. PhysicalDevice was the odd one out — used
`-` and a hand-rolled sanitiser. Operators rely on the dot
separator for cross-kind grep (`kubectl get … | grep '<node>\.'`
works for storagepools + resources + snapshots; PhysicalDevice
broke the pattern).

Moves PhysicalDeviceCRDName from pkg/satellite/discovery.go to
pkg/store/k8s/physicaldevices.go where the analogous functions
live, and replaces the hand-rolled slug with the standard
`Name(node + "." + stableID)` shape. Pinned by a new test in
crdname_test.go covering the pass-through and slugified paths.

The PhysicalDevice type doc-comment now points operators at the
cross-CRD convention so future readers know not to deviate.

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

Author: kvaps

api/v1alpha1/physicaldevice_types.go

@@ -180,7 +180,10 @@ type PhysicalDevice struct {
 	metav1.TypeMeta `json:",inline"`
 
 	// metadata is a standard object metadata. The expected name
-	// shape is `<nodeName>-<stable-id-slug>`; the metadata.labels
+	// shape is `<nodeName>.<stable-id-slug>` (matching every
+	// other composite-key CRD in the project — Resource,
+	// StoragePool, Snapshot — so operators can grep across
+	// kinds with a single `<node>.` pattern); the metadata.labels
 	// must carry `blockstor.io/node=<nodeName>` so per-node
 	// filters work via label selectors.
 	// +optional

pkg/satellite/discovery.go

@@ -105,47 +105,6 @@ func slugifyForLSStableID(in string) string {
 	return b.String()
 }
 
-// PhysicalDeviceCRDName composes the `metadata.name` for a
-// PhysicalDevice CRD: `<nodeName>-<stable-id-slug>`. K8s name
-// constraints (RFC 1123 label, lowercase alphanumeric + `-`,
-// max 63 chars per segment) drive the further sanitisation:
-// underscores become hyphens, every other invalid char is
-// dropped, the whole thing is lowercased, and we cap at 63 chars
-// after the node-name + separator (truncating the slug if
-// needed; collisions are vanishingly unlikely with stable-id
-// entropy).
-func PhysicalDeviceCRDName(nodeName, stableID string) string {
-	const (
-		maxK8sName        = 253
-		stableIDMaxLength = 200
-	)
-
-	slug := strings.ToLower(strings.ReplaceAll(stableID, "_", "-"))
-
-	var b strings.Builder
-
-	for _, r := range slug {
-		switch {
-		case r >= 'a' && r <= 'z',
-			r >= '0' && r <= '9',
-			r == '-':
-			b.WriteRune(r)
-		}
-	}
-
-	clean := b.String()
-	if len(clean) > stableIDMaxLength {
-		clean = clean[:stableIDMaxLength]
-	}
-
-	out := strings.ToLower(nodeName) + "-" + clean
-	if len(out) > maxK8sName {
-		out = out[:maxK8sName]
-	}
-
-	return out
-}
-
 // DiscoveryAction is one entry in the diff plan the discovery
 // loop computes. Pure data — the actual store mutations happen
 // in the loop's caller using a `store.PhysicalDeviceStore`.

pkg/satellite/discovery_test.go

@@ -102,40 +102,6 @@ func TestPickStableIDByPathFallback(t *testing.T) {
 	}
 }
 
-// TestPhysicalDeviceCRDNameSanitises pins the k8s name shape:
-// underscores → hyphens, uppercase → lowercase, anything outside
-// `[a-z0-9-]` dropped, max 253 chars total.
-func TestPhysicalDeviceCRDNameSanitises(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		node, stable, want string
-	}{
-		{
-			node:   "n1",
-			stable: "wwn-0x5000c500a3b1c2d3",
-			want:   "n1-wwn-0x5000c500a3b1c2d3",
-		},
-		{
-			node:   "N1-Worker",
-			stable: "scsi-SATA_Samsung_SSD_980_PRO_S6BUNS0R123456",
-			want:   "n1-worker-scsi-sata-samsung-ssd-980-pro-s6buns0r123456",
-		},
-		{
-			node:   "n2",
-			stable: "nvme-INTEL@SSDPF21Q400GB_PHM2!1234",
-			want:   "n2-nvme-intelssdpf21q400gb-phm21234",
-		},
-	}
-
-	for _, tc := range cases {
-		got := satellite.PhysicalDeviceCRDName(tc.node, tc.stable)
-		if got != tc.want {
-			t.Errorf("%s + %s: got %q, want %q", tc.node, tc.stable, got, tc.want)
-		}
-	}
-}
-
 // TestDiscoveryDiffCreate pins the new-device case: a device in
 // `discovered` that isn't in `existing` becomes an OpCreate.
 func TestDiscoveryDiffCreate(t *testing.T) {

pkg/store/k8s/crdname_test.go

@@ -117,3 +117,29 @@ func TestSetOriginalName_PassThroughDoesNotAnnotate(t *testing.T) {
 		t.Errorf("OriginalName = %q, want %q", got, original)
 	}
 }
+
+// TestPhysicalDeviceCRDNameUsesDotSeparator pins the cross-CRD
+// naming convention: every composite-key CRD in the project
+// (StoragePool, Resource, Snapshot, PhysicalDevice) uses
+// `<key1>.<key2>` and routes through `Name()` for slug
+// discipline. Operators rely on this — `kubectl get … | grep
+// '<node>\.' ` works across kinds. A regression that switched
+// PhysicalDevice to a hyphen separator would silently break that
+// grep workflow.
+func TestPhysicalDeviceCRDNameUsesDotSeparator(t *testing.T) {
+	t.Parallel()
+
+	// RFC1123-clean inputs pass through verbatim with the dot.
+	got := k8s.PhysicalDeviceCRDName("n1", "wwn-0xabcdef0123456789")
+	if got != "n1.wwn-0xabcdef0123456789" {
+		t.Errorf("got %q, want n1.wwn-0xabcdef0123456789", got)
+	}
+
+	// Inputs with characters k8s rejects (uppercase, underscore,
+	// at-sign) get slugified by Name() — same path other
+	// composite-key CRDs travel through.
+	got = k8s.PhysicalDeviceCRDName("N1-Worker", "scsi-SATA_Samsung_SSD_980_PRO_S6BUNS0R")
+	if !strings.Contains(got, "n1-worker") {
+		t.Errorf("got %q, want substring n1-worker (slugified node)", got)
+	}
+}

pkg/store/k8s/physicaldevices.go

@@ -35,6 +35,22 @@ type physicalDevices struct {
 	c ctrlclient.Client
 }
 
+// PhysicalDeviceCRDName encodes the (node, stable-id) composite
+// key into a single CRD name. Uses the same `<node>.<key>` shape
+// as `crdName` (StoragePool), `resourceCRDName` (Resource), and
+// `snapshotCRDName` (Snapshot) — every composite-key CRD in the
+// project follows this convention so operators can grep for
+// `node.something` and find every related CRD across kinds.
+//
+// Run through `Name()` to slugify: stable identifiers carry
+// upstream udev shapes (`wwn-0x...`, `scsi-SATA_<vendor>_...`)
+// with characters k8s names reject; `Name()` lowercases,
+// substitutes invalid runes with `-`, and prepends an 8-char
+// SHA256 prefix when slugification was lossy. Phase 10.7.
+func PhysicalDeviceCRDName(nodeName, stableID string) string {
+	return Name(nodeName + "." + stableID)
+}
+
 func (s *physicalDevices) List(ctx context.Context) ([]apiv1.PhysicalDevice, error) {
 	var crdList crdv1alpha1.PhysicalDeviceList