Merge pull request kubernetes#93148 from claudiubelu/windows/fixes-subpath-symlink

k8s-ci-robot · web-flow · commit a9f0fcc68cbd · 2020-07-21T15:00:20.000-07:00
Windows: Fixes subpath symlink evaluation
diff --git a/pkg/volume/util/subpath/subpath_windows.go b/pkg/volume/util/subpath/subpath_windows.go
@@ -55,6 +55,10 @@ func evalPath(path string) (linkedPath string, err error) {
 		return "", err
 	}
 	linkedPath = strings.TrimSpace(string(output))
+	if linkedPath == "" {
+		klog.V(4).Infof("Path '%s' has no target. Consiering it as evaluated.", path)
+		return path, nil
+	}
 	if isVolumePrefix(linkedPath) {
 		return path, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ func evalPath(path string) (linkedPath string, err error) {`
`55`	`55`	`return "", err`
`56`	`56`	`}`
`57`	`57`	`linkedPath = strings.TrimSpace(string(output))`
	`58`	`+ if linkedPath == "" {`
	`59`	`+ klog.V(4).Infof("Path '%s' has no target. Consiering it as evaluated.", path)`
	`60`	`+ return path, nil`
	`61`	`+ }`
`58`	`62`	`if isVolumePrefix(linkedPath) {`
`59`	`63`	`return path, err`
`60`	`64`	`}`