remove user volumes backed by tmpfs

Author: pranav767

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

@@ -37,8 +37,7 @@ func LocateAndProvision(ctx context.Context, logger *zap.Logger, volumeContext M
 
 		return nil
 	case block.VolumeTypeMemory:
-		// memory volumes are always ready, but need size set from parameters
-		// Extract size from mount parameters
+		// memory volumes are always ready, but need size from parameters
 		for _, param := range volumeContext.Cfg.TypedSpec().Mount.Parameters {
 			if param.Name == "size" && param.String != nil {
 				var size uint64
@@ -95,7 +94,6 @@ func LocateAndProvision(ctx context.Context, logger *zap.Logger, volumeContext M
 		for _, diskCtx := range volumeContext.Disks {
 			if dv.ParentDevPath != "" && diskCtx.Disk.DevPath == dv.ParentDevPath {
 				matchContext["disk"] = diskCtx.Disk
-				// Add system_disk to context (needed for VolumeLocator expressions that reference disk)
 				if val, ok := diskCtx.SystemDisk.Get(); ok {
 					matchContext["system_disk"] = val
 				}
@@ -105,7 +103,6 @@ func LocateAndProvision(ctx context.Context, logger *zap.Logger, volumeContext M
 
 			if dv.ParentDevPath == "" && diskCtx.Disk.DevPath == dv.DevPath {
 				matchContext["disk"] = diskCtx.Disk
-				// Add system_disk to context (needed for VolumeLocator expressions that reference disk)
 				if val, ok := diskCtx.SystemDisk.Get(); ok {
 					matchContext["system_disk"] = val
 				}

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

@@ -125,27 +125,7 @@ func UserVolumeTransformer(c configconfig.Config) ([]VolumeResource, error) {
 				WithConvertEncryptionConfiguration(userVolumeConfig.Encryption()).
 				WriterFunc()
 
-		case block.VolumeTypeMemory:
-			userVolumeResource.TransformFunc = NewBuilder().
-				WithType(block.VolumeTypeMemory).
-				WithMount(block.MountSpec{
-					TargetPath:   userVolumeConfig.Name(),
-					ParentID:     constants.UserVolumeMountPoint,
-					SelinuxLabel: constants.EphemeralSelinuxLabel,
-					FileMode:     0o755,
-					UID:          0,
-					GID:          0,
-					Parameters: []block.ParameterSpec{
-						{
-							Type:   block.FSParameterTypeStringValue,
-							Name:   "size",
-							String: pointer.To(fmt.Sprintf("%d", cmp.Or(userVolumeConfig.Provisioning().MinSize().ValueOrZero(), MinUserVolumeSize))),
-						},
-					},
-				}).
-				WriterFunc()
-
-		case block.VolumeTypeTmpfs, block.VolumeTypeSymlink, block.VolumeTypeOverlay, block.VolumeTypeExternal:
+		case block.VolumeTypeTmpfs, block.VolumeTypeSymlink, block.VolumeTypeOverlay, block.VolumeTypeExternal, block.VolumeTypeMemory:
 			fallthrough
 
 		default:

internal/app/machined/pkg/controllers/block/mount.go

@@ -445,9 +445,7 @@ func (ctrl *MountController) handleMemoryMountOperation(
 
 	logger = logger.With(zap.String("mount_request.id", mountRequest.Metadata().ID()))
 
-	// mount hasn't been done yet
 	if !ok {
-		// Extract size from mount parameters
 		var sizeOpt string
 
 		for _, param := range volumeStatus.TypedSpec().MountSpec.Parameters {
@@ -477,7 +475,6 @@ func (ctrl *MountController) handleMemoryMountOperation(
 			return fmt.Errorf("failed to mount tmpfs at %s: %w", mountTarget, err)
 		}
 
-		// Apply SELinux label if specified
 		if volumeStatus.TypedSpec().MountSpec.SelinuxLabel != "" {
 			if err := selinux.SetLabel(mountTarget, volumeStatus.TypedSpec().MountSpec.SelinuxLabel); err != nil {
 				unix.Unmount(mountTarget, 0) //nolint:errcheck
@@ -486,7 +483,6 @@ func (ctrl *MountController) handleMemoryMountOperation(
 			}
 		}
 
-		// Update ownership and permissions if specified
 		if !mountRequest.TypedSpec().ReadOnly && !mountRequest.TypedSpec().Detached {
 			if err := ctrl.updateTargetSettings(mountTarget, volumeStatus.TypedSpec().MountSpec); err != nil {
 				unix.Unmount(mountTarget, 0) //nolint:errcheck
@@ -500,7 +496,6 @@ func (ctrl *MountController) handleMemoryMountOperation(
 			zap.String("target", mountTarget),
 		)
 
-		// Store the mount context
 		ctrl.activeMounts[mountRequest.Metadata().ID()] = &mountContext{
 			point:    nil, // No mount.Point for direct unix.Mount
 			readOnly: mountRequest.TypedSpec().ReadOnly,

pkg/machinery/config/types/block/user_volume_config.go

@@ -272,20 +272,7 @@ func (s *UserVolumeConfigV1Alpha1) Validate(validation.RuntimeMode, ...validatio
 		warnings = append(warnings, extraWarnings...)
 		validationErrors = errors.Join(validationErrors, extraErrors)
 
-	case block.VolumeTypeMemory:
-		if !s.ProvisioningSpec.IsZero() {
-			validationErrors = errors.Join(validationErrors, errors.New("provisioning spec is invalid for volumeType memory"))
-		}
-
-		if !s.EncryptionSpec.IsZero() {
-			validationErrors = errors.Join(validationErrors, errors.New("encryption spec is invalid for volumeType memory"))
-		}
-
-		if !s.FilesystemSpec.IsZero() {
-			validationErrors = errors.Join(validationErrors, errors.New("filesystem spec is invalid for volumeType memory"))
-		}
-
-	case block.VolumeTypeTmpfs, block.VolumeTypeSymlink, block.VolumeTypeOverlay, block.VolumeTypeExternal:
+	case block.VolumeTypeTmpfs, block.VolumeTypeSymlink, block.VolumeTypeOverlay, block.VolumeTypeExternal, block.VolumeTypeMemory:
 		fallthrough
 
 	default: