fix: swap volume configuration for min/max size

smira · smira · commit 64f49851aa34 · 2026-02-12T17:26:11.000+04:00
The min size wasn't propagated correctly, and max size was set quite wrong. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit d905035)
diff --git a/internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/user_volumes.go b/internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/user_volumes.go
@@ -232,7 +232,8 @@ func SwapVolumeTransformer(c configconfig.Config) ([]VolumeResource, error) {
 						Match: swapVolumeConfig.Provisioning().DiskSelector().ValueOr(noMatch),
 					},
 					PartitionSpec: block.PartitionSpec{
-						MaxSize:         cmp.Or(swapVolumeConfig.Provisioning().MaxSize().ValueOrZero(), MinUserVolumeSize),
+						MinSize:         cmp.Or(swapVolumeConfig.Provisioning().MinSize().ValueOrZero(), MinUserVolumeSize),
+						MaxSize:         swapVolumeConfig.Provisioning().MaxSize().ValueOrZero(),
 						RelativeMaxSize: swapVolumeConfig.Provisioning().RelativeMaxSize().ValueOrZero(),
 						Grow:            swapVolumeConfig.Provisioning().Grow().ValueOrZero(),
 						Label:           volumeID,
diff --git a/internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/user_volumes_test.go b/internal/app/machined/pkg/controllers/block/internal/volumes/volumeconfig/user_volumes_test.go
@@ -383,6 +383,49 @@ func TestSwapVolumeTransformer(t *testing.T) {
 					assert.Equal(t, block.FilesystemTypeSwap, vc.TypedSpec().Provisioning.FilesystemSpec.Type)
 					assert.Equal(t, constants.SwapVolumePrefix+"swap1", vc.TypedSpec().Provisioning.PartitionSpec.Label)
 					assert.Equal(t, block.WaveUserVolumes, vc.TypedSpec().Provisioning.Wave)
+
+					assert.EqualValues(t, volumeconfig.MinUserVolumeSize, vc.TypedSpec().Provisioning.PartitionSpec.MinSize)
+					assert.EqualValues(t, 0, vc.TypedSpec().Provisioning.PartitionSpec.MaxSize)
+				})
+
+				testMountTransformFunc(t, resources[0].MountTransformFunc, func(t *testing.T, m *block.VolumeMountRequest, err error) {
+					// default mount transform is noop
+					require.NoError(t, err)
+				})
+			},
+		},
+		{
+			name: "swap volume with sizes",
+			cfg: []*blockcfg.SwapVolumeConfigV1Alpha1{
+				{
+					Meta: meta.Meta{
+						MetaKind:       blockcfg.SwapVolumeConfigKind,
+						MetaAPIVersion: "v1alpha1",
+					},
+					MetaName: "swap1",
+					ProvisioningSpec: blockcfg.ProvisioningSpec{
+						ProvisioningMinSize: blockcfg.MustByteSize("1GB"),
+						ProvisioningMaxSize: blockcfg.MustSize("2GB"),
+					},
+				},
+			},
+			checkFunc: func(t *testing.T, resources []volumeconfig.VolumeResource) {
+				require.Len(t, resources, 1)
+
+				assert.Equal(t, constants.SwapVolumePrefix+"swap1", resources[0].VolumeID)
+				assert.Equal(t, block.SwapVolumeLabel, resources[0].Label)
+
+				testTransformFunc(t, resources[0].TransformFunc, func(t *testing.T, vc *block.VolumeConfig, err error) {
+					require.NoError(t, err)
+
+					assert.Equal(t, block.VolumeTypePartition, vc.TypedSpec().Type)
+
+					assert.Equal(t, block.FilesystemTypeSwap, vc.TypedSpec().Provisioning.FilesystemSpec.Type)
+					assert.Equal(t, constants.SwapVolumePrefix+"swap1", vc.TypedSpec().Provisioning.PartitionSpec.Label)
+					assert.Equal(t, block.WaveUserVolumes, vc.TypedSpec().Provisioning.Wave)
+
+					assert.EqualValues(t, 1*1000*1000*1000, vc.TypedSpec().Provisioning.PartitionSpec.MinSize)
+					assert.EqualValues(t, 2*1000*1000*1000, vc.TypedSpec().Provisioning.PartitionSpec.MaxSize)
 				})
 
 				testMountTransformFunc(t, resources[0].MountTransformFunc, func(t *testing.T, m *block.VolumeMountRequest, err error) {
