github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compute configmap/secret key correctly cross-platform

Browse Source
This commit is contained in:
Jordan Liggitt
2018-05-04 12:00:50 -04:00
parent bb4745da99
commit 17e62d91af
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/util/util.go
View File

@@ -21,6 +21,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"path" "path"
"path/filepath"
"strings" "strings"
"time" "time"
@@ -60,7 +61,7 @@ func ParseFileSource(source string) (keyName, filePath string, err error) {
numSeparators := strings.Count(source, "=") numSeparators := strings.Count(source, "=")
switch { switch {
case numSeparators == 0: case numSeparators == 0:
return path.Base(source), source, nil return path.Base(filepath.ToSlash(source)), source, nil
case numSeparators == 1 && strings.HasPrefix(source, "="): case numSeparators == 1 && strings.HasPrefix(source, "="):
return "", "", fmt.Errorf("key name for file path %v missing.", strings.TrimPrefix(source, "=")) return "", "", fmt.Errorf("key name for file path %v missing.", strings.TrimPrefix(source, "="))
case numSeparators == 1 && strings.HasSuffix(source, "="): case numSeparators == 1 && strings.HasSuffix(source, "="):