diff --git a/pkg/apihelper/jsonpatch.go b/pkg/apihelper/jsonpatch.go index 0939cc8b6..acb9aba8e 100644 --- a/pkg/apihelper/jsonpatch.go +++ b/pkg/apihelper/jsonpatch.go @@ -17,7 +17,7 @@ limitations under the License. package apihelper import ( - "path/filepath" + "path" "strings" ) @@ -29,6 +29,6 @@ type JsonPatch struct { } // NewJsonPatch returns a new JsonPatch object -func NewJsonPatch(verb string, path string, key string, value string) JsonPatch { - return JsonPatch{verb, filepath.Join(path, strings.ReplaceAll(key, "/", "~1")), value} +func NewJsonPatch(verb string, jsonpath string, key string, value string) JsonPatch { + return JsonPatch{verb, path.Join(jsonpath, strings.ReplaceAll(key, "/", "~1")), value} } diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go index c58d78d18..6196bb843 100644 --- a/pkg/nfd-master/nfd-master.go +++ b/pkg/nfd-master/nfd-master.go @@ -24,7 +24,7 @@ import ( "log" "net" "os" - "path/filepath" + "path" "regexp" "sort" "strconv" @@ -500,7 +500,7 @@ func addNs(src string, nsToAdd string) string { if strings.Contains(src, "/") { return src } - return filepath.Join(nsToAdd, src) + return path.Join(nsToAdd, src) } // splitNs splits a name into its namespace and name parts