Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #368 from galal-hussein/skip_hidden_files

Browse Source 
Skip any file with no yaml yml or json suffix
This commit is contained in:
Darren Shepherd 2019-04-25 11:23:58 -07:00 committed by GitHub
commit 1f4be58475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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") {
skips[strings.TrimSuffix(file.Name(), ".skip")] = true
}
}
var errs []error
for _, file := range files {
if strings.HasSuffix(file.Name(), ".skip") || skips[file.Name()] {
if skipFile(file.Name(), skips) {
continue
}
p := filepath.Join(base, file.Name())
@ -305,3 +304,20 @@ func toObjects(bytes []byte) ([]runtime.Object, error) {
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
}
}