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 #892 from iwilltry42/master

Browse Source 
[Enhancement] include subdirectories for auto-deploy manifests
This commit is contained in:
Erik Wilson 2019-10-16 16:30:35 -07:00 committed by GitHub
commit 265181715a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/deploy/controller.go
View File

@ -85,10 +85,14 @@ func (w *watcher) listFiles(force bool) error {
} }
func (w *watcher) listFilesIn(base string, force bool) error { func (w *watcher) listFilesIn(base string, force bool) error {
files, err := ioutil.ReadDir(base) files := map[string]os.FileInfo{}
if os.IsNotExist(err) { if err := filepath.Walk(base, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
files[path] = info
return nil return nil
} else if err != nil { }); err != nil {
return err return err
} }
@ -100,13 +104,12 @@ func (w *watcher) listFilesIn(base string, force bool) error {
} }
var errs []error var errs []error
for _, file := range files { for path, file := range files {
if skipFile(file.Name(), skips) { if skipFile(file.Name(), skips) {
continue continue
} }
p := filepath.Join(base, file.Name()) if err := w.deploy(path, !force); err != nil {
if err := w.deploy(p, !force); err != nil { errs = append(errs, errors2.Wrapf(err, "failed to process %s", path))
errs = append(errs, errors2.Wrapf(err, "failed to process %s", p))
} }
} }