Merge pull request #1478 from huww98/fix-subpath-creation

k8s-ci-robot · web-flow · commit 6acf7de63007 · 2025-07-31T19:41:14.000-07:00
nas: fix subpath creation
diff --git a/pkg/nas/utils.go b/pkg/nas/utils.go
@@ -139,7 +139,11 @@ func doMount(mounter mountutils.Interface, opt *Options, targetPath, volumeId, p
 	}
 	rootSource := fmt.Sprintf("%s:%s", opt.Server, rootPath)
 	klog.Infof("trying to create subpath %s in %s", opt.Path, opt.Server)
-	tmpPath, err := os.MkdirTemp(filepath.Join(utils.KubeletRootDir, "csi-plugins", driverName, "node"), "subpath-creation_"+volumeId+"_")
+	tmpPath := filepath.Join(utils.KubeletRootDir, "csi-plugins", driverName, "node")
+	if err := os.MkdirAll(tmpPath, 0o700); err != nil {
+		return err
+	}
+	tmpPath, err = os.MkdirTemp(tmpPath, "subpath-creation_"+volumeId+"_")
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,11 @@ func doMount(mounter mountutils.Interface, opt *Options, targetPath, volumeId, p`
`139`	`139`	`}`
`140`	`140`	`rootSource := fmt.Sprintf("%s:%s", opt.Server, rootPath)`
`141`	`141`	`klog.Infof("trying to create subpath %s in %s", opt.Path, opt.Server)`
`142`		`- tmpPath, err := os.MkdirTemp(filepath.Join(utils.KubeletRootDir, "csi-plugins", driverName, "node"), "subpath-creation_"+volumeId+"_")`
	`142`	`+ tmpPath := filepath.Join(utils.KubeletRootDir, "csi-plugins", driverName, "node")`
	`143`	`+ if err := os.MkdirAll(tmpPath, 0o700); err != nil {`
	`144`	`+ return err`
	`145`	`+ }`
	`146`	`+ tmpPath, err = os.MkdirTemp(tmpPath, "subpath-creation_"+volumeId+"_")`
`143`	`147`	`if err != nil {`
`144`	`148`	`return err`
`145`	`149`	`}`