fix: disks flag parsing and handling in create qemu command

Orzelius · smira · commit 1ce9328e4db0 · 2026-03-06T19:17:31.000+04:00
The disks flag Set method was appending new disk requests to the existing ones, which caused duplicate disk entries when custom values for the disks flag were set. Signed-off-by: Orzelius <33936483+Orzelius@users.noreply.github.com> (cherry picked from commit ce53ffa)
diff --git a/cmd/talosctl/cmd/mgmt/cluster/create/clusterops/configmaker/internal/makers/qemu_test.go b/cmd/talosctl/cmd/mgmt/cluster/create/clusterops/configmaker/internal/makers/qemu_test.go
@@ -7,11 +7,14 @@ package makers_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/siderolabs/talos/cmd/talosctl/cmd/mgmt/cluster/create/clusterops"
 	"github.com/siderolabs/talos/cmd/talosctl/cmd/mgmt/cluster/create/clusterops/configmaker/internal/makers"
+	"github.com/siderolabs/talos/cmd/talosctl/cmd/mgmt/cluster/create/flags"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate"
+	"github.com/siderolabs/talos/pkg/provision"
 )
 
 func TestQemuMaker_MachineConfig(t *testing.T) {
@@ -29,3 +32,62 @@ func TestQemuMaker_MachineConfig(t *testing.T) {
 
 	assertConfigDefaultness(t, cOps, *m.Maker, desiredExtraGenOps...)
 }
+
+func TestQemuMaker_Disks(t *testing.T) {
+	cOps := clusterops.GetCommon()
+	qOps := clusterops.GetQemu()
+
+	disks := flags.Disks{}
+	err := disks.Set("virtio:10GiB,nvme:20GiB,virtio:30GiB")
+	require.NoError(t, err)
+
+	qOps.Disks = disks
+	cOps.Controlplanes = 1
+	cOps.Workers = 1
+
+	m, err := makers.NewQemu(makers.MakerOptions[clusterops.Qemu]{
+		ExtraOps:    qOps,
+		CommonOps:   cOps,
+		Provisioner: testProvisioner{}, // use test provisioner to simplify the test case.
+	})
+	require.NoError(t, err)
+
+	req, err := m.GetClusterConfigs()
+	require.NoError(t, err)
+
+	controlplaneDisks := req.ClusterRequest.Nodes[0].Disks
+	workerDisks := req.ClusterRequest.Nodes[1].Disks
+
+	assert.Equal(t, 1, len(controlplaneDisks))
+	assert.Equal(t, 3, len(workerDisks))
+
+	assert.Equal(t, []*provision.Disk{
+		{
+			Size:            disks.Requests()[0].Size.Bytes(),
+			SkipPreallocate: !qOps.PreallocateDisks,
+			Driver:          "virtio",
+			BlockSize:       qOps.DiskBlockSize,
+		},
+	}, controlplaneDisks)
+
+	assert.Equal(t, []*provision.Disk{
+		{
+			Size:            disks.Requests()[0].Size.Bytes(),
+			SkipPreallocate: !qOps.PreallocateDisks,
+			Driver:          "virtio",
+			BlockSize:       qOps.DiskBlockSize,
+		},
+		{
+			Size:            disks.Requests()[1].Size.Bytes(),
+			SkipPreallocate: !qOps.PreallocateDisks,
+			Driver:          "nvme",
+			BlockSize:       qOps.DiskBlockSize,
+		},
+		{
+			Size:            disks.Requests()[2].Size.Bytes(),
+			SkipPreallocate: !qOps.PreallocateDisks,
+			Driver:          "virtio",
+			BlockSize:       qOps.DiskBlockSize,
+		},
+	}, workerDisks)
+}
diff --git a/cmd/talosctl/cmd/mgmt/cluster/create/flags/disks.go b/cmd/talosctl/cmd/mgmt/cluster/create/flags/disks.go
@@ -83,7 +83,7 @@ func (f *Disks) Set(value string) error {
 		return err
 	}
 
-	f.requests = append(f.requests, reqs...)
+	f.requests = reqs
 
 	return nil
 }
diff --git a/cmd/talosctl/cmd/mgmt/cluster/create/flags/disks_test.go b/cmd/talosctl/cmd/mgmt/cluster/create/flags/disks_test.go
@@ -23,8 +23,7 @@ func TestDisksFlag_AccumulatesAndRequests(t *testing.T) {
 	fs.Var(&d, "disks", "")
 
 	args := []string{
-		"--disks", "virtio:1GiB",
-		"--disks", "nvme:10GiB,sata:512MiB",
+		"--disks", "virtio:1GiB,nvme:10GiB,sata:512MiB",
 	}
 
 	err := fs.Parse(args)
@@ -55,11 +54,21 @@ func TestDisksFlag_AccumulatesAndRequests(t *testing.T) {
 	assert.Equal(t, "virtio:1GiB,nvme:10GiB,sata:512MiB", d.String())
 }
 
-func TestDisksFlag_SetInvalid(t *testing.T) {
+func TestDisksFlag_Set(t *testing.T) {
 	t.Parallel()
 
 	var d flags.Disks
 
-	err := d.Set("invalid-no-colon")
+	err := d.Set("virtio:6gb")
+	assert.NoError(t, err)
+
+	assert.Equal(t, "virtio:6gb", d.String())
+
+	err = d.Set("nvme:12mb,sata:2gb")
+	assert.NoError(t, err)
+
+	assert.Equal(t, "nvme:12mb,sata:2gb", d.String())
+
+	err = d.Set("invalid-no-colon")
 	assert.Error(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (f *Disks) Set(value string) error {`
`83`	`83`	`return err`
`84`	`84`	`}`
`85`	`85`
`86`		`- f.requests = append(f.requests, reqs...)`
	`86`	`+ f.requests = reqs`
`87`	`87`
`88`	`88`	`return nil`
`89`	`89`	`}`