fix: hold user volumes root mountpoint

smira · smira · commit e5b0eb017ff9 · 2026-02-19T17:47:33.000+04:00
This is a regression introduced in #12122 and #12141. Without this, only `kubelet` holds `/var/mnt`, so on kubelet restart, Talos tries to unmount it, cascading into unmount of all user volumes, which shouldn't be the case. Fixes #12797 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
diff --git a/internal/app/machined/pkg/controllers/block/volume_config.go b/internal/app/machined/pkg/controllers/block/volume_config.go
@@ -92,6 +92,20 @@ func (ctrl *VolumeConfigController) Run(ctx context.Context, r controller.Runtim
 			return nil
 		}
 
+		// create a volume mount request for the root user volume mount point
+		// to keep it alive and prevent it from being torn down
+		if err := safe.WriterModify(ctx, r,
+			block.NewVolumeMountRequest(block.NamespaceName, constants.UserVolumeMountPoint),
+			func(v *block.VolumeMountRequest) error {
+				v.TypedSpec().Requester = ctrl.Name()
+				v.TypedSpec().VolumeID = constants.UserVolumeMountPoint
+
+				return nil
+			},
+		); err != nil {
+			return fmt.Errorf("error creating volume mount request for user volume mount point: %w", err)
+		}
+
 		machineCfg, encryptionMeta, err := ctrl.loadConfiguration(ctx, r)
 		if err != nil {
 			return err
diff --git a/internal/app/machined/pkg/controllers/block/volume_config_test.go b/internal/app/machined/pkg/controllers/block/volume_config_test.go
@@ -82,6 +82,9 @@ func TestVolumeConfigSuite(t *testing.T) {
 }
 
 func (suite *VolumeConfigSuite) TestReconcileDefaults() {
+	// user volume mount point should be hold mounted all the time to prevent cascading unmounts on kubelet restart
+	ctest.AssertResource(suite, constants.UserVolumeMountPoint, func(*block.VolumeMountRequest, *assert.Assertions) {})
+
 	// no machine config, default config which only searches for
 	ctest.AssertResource(suite, constants.MetaPartitionLabel, func(r *block.VolumeConfig, asrt *assert.Assertions) {
 		asrt.Empty(r.TypedSpec().Provisioning)

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ func TestVolumeConfigSuite(t *testing.T) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`func (suite *VolumeConfigSuite) TestReconcileDefaults() {`
	`85`	`+ // user volume mount point should be hold mounted all the time to prevent cascading unmounts on kubelet restart`
	`86`	`+ ctest.AssertResource(suite, constants.UserVolumeMountPoint, func(block.VolumeMountRequest, assert.Assertions) {})`
	`87`	`+`
`85`	`88`	`// no machine config, default config which only searches for`
`86`	`89`	`ctest.AssertResource(suite, constants.MetaPartitionLabel, func(r block.VolumeConfig, asrt assert.Assertions) {`
`87`	`90`	`asrt.Empty(r.TypedSpec().Provisioning)`