fix: split volume/disk locators

Don't guess based on the volume type, but use explicit fields for
different locators.

IMAGECACHE-ISO is a disk volume, but uses full volume locator (by
filesystem type, etc.)

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>

Author: smira

api/resource/definitions/block/block.proto

@@ -113,6 +113,7 @@ message FilesystemSpec {
 // LocatorSpec is the spec for volume locator.
 message LocatorSpec {
   google.api.expr.v1alpha1.CheckedExpr match = 1;
+  google.api.expr.v1alpha1.CheckedExpr disk_match = 2;
 }
 
 // MountRequestSpec is the spec for MountRequest.

internal/app/machined/pkg/controllers/block/internal/volumes/locate.go

@@ -14,6 +14,7 @@ import (
 	"github.com/siderolabs/go-blockdevice/v2/partitioning"
 	"go.uber.org/zap"
 
+	taloscel "github.com/siderolabs/talos/pkg/machinery/cel"
 	"github.com/siderolabs/talos/pkg/machinery/cel/celenv"
 	"github.com/siderolabs/talos/pkg/machinery/resources/block"
 )
@@ -45,18 +46,23 @@ func LocateAndProvision(ctx context.Context, logger *zap.Logger, volumeContext M
 
 	// attempt to discover the volume
 	for _, dv := range volumeContext.DiscoveredVolumes {
-		var locator *cel.Env
+		var (
+			locatorEnv   *cel.Env
+			locatorMatch taloscel.Expression
+		)
 
 		matchContext := map[string]any{}
 
-		switch volumeType { //nolint:exhaustive // we do not need to repeat exhaustive check here
-		case block.VolumeTypeDisk:
-			locator = celenv.DiskLocator()
-
-		case block.VolumeTypePartition:
-			locator = celenv.VolumeLocator()
-
+		switch {
+		case !volumeContext.Cfg.TypedSpec().Locator.Match.IsZero():
+			locatorEnv = celenv.VolumeLocator()
 			matchContext["volume"] = dv
+			locatorMatch = volumeContext.Cfg.TypedSpec().Locator.Match
+		case !volumeContext.Cfg.TypedSpec().Locator.DiskMatch.IsZero():
+			locatorEnv = celenv.DiskLocator()
+			locatorMatch = volumeContext.Cfg.TypedSpec().Locator.DiskMatch
+		default:
+			return fmt.Errorf("no locator expression set for volume")
 		}
 
 		// add disk to the context, so we can use it in CEL expressions
@@ -74,7 +80,7 @@ func LocateAndProvision(ctx context.Context, logger *zap.Logger, volumeContext M
 			}
 		}
 
-		matches, err := volumeContext.Cfg.TypedSpec().Locator.Match.EvalBool(locator, matchContext)
+		matches, err := locatorMatch.EvalBool(locatorEnv, matchContext)
 		if err != nil {
 			return fmt.Errorf("error evaluating volume locator: %w", err)
 		}

internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/user_volumes.go

@@ -65,7 +65,7 @@ func UserVolumeTransformer(c configconfig.Config) ([]VolumeResource, error) {
 		case block.VolumeTypeDisk:
 			userVolumeResource.TransformFunc = NewBuilder().
 				WithType(block.VolumeTypeDisk).
-				WithLocator(userVolumeConfig.Provisioning().DiskSelector().ValueOr(noMatch)).
+				WithDiskLocator(userVolumeConfig.Provisioning().DiskSelector().ValueOr(noMatch)).
 				WithProvisioning(block.ProvisioningSpec{
 					Wave: block.WaveUserVolumes,
 					DiskSelector: block.DiskSelector{

internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/volume_config_builder.go

@@ -44,7 +44,7 @@ func (b *Builder) WithType(volumeType block.VolumeType) *Builder {
 	return b
 }
 
-// WithLocator sets VolumeConfigSpec.Locator.
+// WithLocator sets VolumeConfigSpec.Locator.Match.
 func (b *Builder) WithLocator(match cel.Expression) *Builder {
 	b.opts = append(b.opts, func(spec *block.VolumeConfigSpec) error {
 		spec.Locator = block.LocatorSpec{Match: match}
@@ -55,6 +55,17 @@ func (b *Builder) WithLocator(match cel.Expression) *Builder {
 	return b
 }
 
+// WithDiskLocator sets VolumeConfigSpec.Locator.DiskMatch.
+func (b *Builder) WithDiskLocator(diskMatch cel.Expression) *Builder {
+	b.opts = append(b.opts, func(spec *block.VolumeConfigSpec) error {
+		spec.Locator = block.LocatorSpec{DiskMatch: diskMatch}
+
+		return nil
+	})
+
+	return b
+}
+
 // WithProvisioning sets VolumeConfigSpec.Provisioning.
 func (b *Builder) WithProvisioning(provisioning block.ProvisioningSpec) *Builder {
 	b.opts = append(b.opts, func(spec *block.VolumeConfigSpec) error {

pkg/machinery/api/resource/definitions/block/block.pb.go

@@ -106,7 +106,10 @@ type PartitionSpec struct {
 //
 //gotagsrewrite:gen
 type LocatorSpec struct {
+	// Match is a volume locator match expression.
 	Match cel.Expression `yaml:"match,omitempty" protobuf:"1"`
+	// DiskMatch is a disk locator match expression.
+	DiskMatch cel.Expression `yaml:"diskMatch,omitempty" protobuf:"2"`
 }
 
 // FilesystemSpec is the spec for volume filesystem.

pkg/machinery/api/resource/definitions/block/block_vtproto.pb.go

@@ -5713,6 +5713,7 @@ LocatorSpec is the spec for volume locator.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | match | [google.api.expr.v1alpha1.CheckedExpr](#google.api.expr.v1alpha1.CheckedExpr) |  |  |
+| disk_match | [google.api.expr.v1alpha1.CheckedExpr](#google.api.expr.v1alpha1.CheckedExpr) |  |  |