Merge pull request #83 from MiaoZhou/fixEmptyCustomPath

prevent mounting of root directory

Merge pull request #83 from MiaoZhou/fixEmptyCustomPath
eae7143d · Kubernetes Prow Robot · GitHub · 888d6dbd · b8e20366 · eae7143d
Unverified Commit eae7143d authored Apr 01, 2021 by Kubernetes Prow Robot Committed by GitHub Apr 01, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

provisioner.go cmd/nfs-subdir-external-provisioner/provisioner.go +4 -2

No files found.
--- a/cmd/nfs-subdir-external-provisioner/provisioner.go
+++ b/cmd/nfs-subdir-external-provisioner/provisioner.go
@@ -104,8 +104,10 @@ func (p *nfsProvisioner) Provision(ctx context.Context, options controller.Provi
 	pathPattern, exists := options.StorageClass.Parameters["pathPattern"]
 	if exists {
 		customPath := metadata.stringParser(pathPattern)
-		path = filepath.Join(p.path, customPath)
-		fullPath = filepath.Join(mountPath, customPath)
+		if customPath != "" {
+			path = filepath.Join(p.path, customPath)
+			fullPath = filepath.Join(mountPath, customPath)
+		}
 	}

 	glog.V(4).Infof("creating path %s", fullPath)