github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip any file with no yaml yml or json suffix

pull/368/head
galal-hussein 2019-04-18 00:13:11 +02:00
parent 334efc743b
commit c42ea5ec89
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/deploy/controller.go
View File

@ -109,12 +109,11 @@ func (w *watcher) listFilesIn(base string, force bool) error {
if strings.HasSuffix(file.Name(), ".skip") { if strings.HasSuffix(file.Name(), ".skip") {
skips[strings.TrimSuffix(file.Name(), ".skip")] = true skips[strings.TrimSuffix(file.Name(), ".skip")] = true
} }
} }
var errs []error var errs []error
for _, file := range files { for _, file := range files {
if strings.HasSuffix(file.Name(), ".skip") || skips[file.Name()] { if skipFile(file.Name(), skips) {
continue continue
} }
p := filepath.Join(base, file.Name()) p := filepath.Join(base, file.Name())
@ -305,3 +304,20 @@ func toObjects(bytes []byte) ([]runtime.Object, error) {
return []runtime.Object{obj}, nil return []runtime.Object{obj}, nil
} }
func skipFile(fileName string, skips map[string]bool) bool {
switch {
case strings.HasPrefix(fileName, "."):
return true
case skips[fileName]:
return true
case strings.HasSuffix(fileName, ".json"):
return false
case strings.HasSuffix(fileName, ".yml"):
return false
case strings.HasSuffix(fileName, ".yaml"):
return false
default:
return true
}
}