From dca01289663ffa3325b0f80c88dff8d0a8333335 Mon Sep 17 00:00:00 2001
From: Pengfei Ni <peni@microsoft.com>
Date: Tue, 17 Apr 2018 10:44:30 +0800
Subject: [PATCH] Use filepath.Clean() instead of path.Clean()

---
 pkg/volume/downwardapi/downwardapi.go | 3 ++-
 pkg/volume/quobyte/quobyte_util.go    | 5 +++--
 pkg/volume/util/atomic_writer_test.go | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/volume/downwardapi/downwardapi.go b/pkg/volume/downwardapi/downwardapi.go
index dc69a09160..e1c1c536ee 100644
--- a/pkg/volume/downwardapi/downwardapi.go
+++ b/pkg/volume/downwardapi/downwardapi.go
@@ -19,6 +19,7 @@ package downwardapi
 import (
 	"fmt"
 	"path"
+	"path/filepath"
 	"sort"
 	"strings"
 
@@ -229,7 +230,7 @@ func CollectData(items []v1.DownwardAPIVolumeFile, pod *v1.Pod, host volume.Volu
 	data := make(map[string]volumeutil.FileProjection)
 	for _, fileInfo := range items {
 		var fileProjection volumeutil.FileProjection
-		fPath := path.Clean(fileInfo.Path)
+		fPath := filepath.Clean(fileInfo.Path)
 		if fileInfo.Mode != nil {
 			fileProjection.Mode = *fileInfo.Mode
 		} else {
diff --git a/pkg/volume/quobyte/quobyte_util.go b/pkg/volume/quobyte/quobyte_util.go
index c1deb552a3..fa9bd54a80 100644
--- a/pkg/volume/quobyte/quobyte_util.go
+++ b/pkg/volume/quobyte/quobyte_util.go
@@ -18,7 +18,8 @@ package quobyte
 
 import (
 	"net"
-	"path"
+	"os"
+	"path/filepath"
 	"strings"
 
 	"k8s.io/api/core/v1"
@@ -101,7 +102,7 @@ func (mounter *quobyteMounter) pluginDirIsMounted(pluginDir string) (bool, error
 }
 
 func (mounter *quobyteMounter) correctTraillingSlash(regStr string) string {
-	return path.Clean(regStr) + "/"
+	return filepath.Clean(regStr) + string(os.PathSeparator)
 }
 
 func validateRegistry(registry string) bool {
diff --git a/pkg/volume/util/atomic_writer_test.go b/pkg/volume/util/atomic_writer_test.go
index 4f8869b1a7..6d391ac2b4 100644
--- a/pkg/volume/util/atomic_writer_test.go
+++ b/pkg/volume/util/atomic_writer_test.go
@@ -804,7 +804,7 @@ func checkVolumeContents(targetDir, tcName string, payload map[string]FileProjec
 
 	cleanPathPayload := make(map[string]FileProjection, len(payload))
 	for k, v := range payload {
-		cleanPathPayload[path.Clean(k)] = v
+		cleanPathPayload[filepath.Clean(k)] = v
 	}
 
 	if !reflect.DeepEqual(cleanPathPayload, observedPayload) {