fix: correctly escape '.' in volume names

Volume name is derived from the mount path. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Mar 28, 2022 · 0fd2aa0 · 0fd2aa0
1 parent 108fd03
commit 0fd2aa0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go b/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go
@@ -172,6 +172,10 @@ func (suite *K8sControlPlaneSuite) TestReconcileExtraVolumes() {
 							VolumeHostPath:  "/var/lib",
 							VolumeMountPath: "/var/foo/",
 						},
+						{
+							VolumeHostPath:  "/var/lib/a.foo",
+							VolumeMountPath: "/var/foo/b.foo",
+						},
 					},
 				},
 			},
@@ -187,6 +191,12 @@ func (suite *K8sControlPlaneSuite) TestReconcileExtraVolumes() {
 				MountPath: "/var/foo/",
 				ReadOnly:  false,
 			},
+			{
+				Name:      "var-foo-b-foo",
+				HostPath:  "/var/lib/a.foo",
+				MountPath: "/var/foo/b.foo",
+				ReadOnly:  false,
+			},
 		}, apiServerCfg.ExtraVolumes,
 	)
 }

diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_provider.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_provider.go
@@ -1252,9 +1252,11 @@ func (v VolumeMountConfig) MountPath() string {
 	return v.VolumeMountPath
 }
 
+var volumeNameSanitizer = strings.NewReplacer("/", "-", "_", "-", ".", "-")
+
 // Name implements the config.VolumeMount interface.
 func (v VolumeMountConfig) Name() string {
-	return strings.Trim(strings.ReplaceAll(strings.ReplaceAll(v.VolumeMountPath, "/", "-"), "_", "-"), "-")
+	return strings.Trim(volumeNameSanitizer.Replace(v.VolumeMountPath), "-")
 }
 
 // ReadOnly implements the config.VolumeMount interface.