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

Merge pull request #1669 from erikwilson/manifest-mod-time 

Check modification time before deploying manifests
pull/1677/head v1.18.2-rc2+k3s1
Erik Wilson 2020-04-23 14:17:14 -07:00 committed by GitHub
parent b2cab73d27 fec2c271c2
commit 2c49341113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/deploy/controller.go
View File

@ -41,6 +41,7 @@ func WatchFiles(ctx context.Context, apply apply.Apply, addons v1.AddonControlle
addons: addons, addons: addons,
bases: bases, bases: bases,
disables: disables, disables: disables,
modTime: map[string]time.Time{},
} }
addons.Enqueue("", startKey) addons.Enqueue("", startKey)
@ -60,6 +61,7 @@ type watcher struct {
addons v1.AddonClient addons v1.AddonClient
bases []string bases []string
disables map[string]bool disables map[string]bool
modTime map[string]time.Time
} }
func (w *watcher) start(ctx context.Context) { func (w *watcher) start(ctx context.Context) {
@ -84,7 +86,6 @@ func (w *watcher) listFiles(force bool) error {
if err := w.listFilesIn(base, force); err != nil { if err := w.listFilesIn(base, force); err != nil {
errs = append(errs, err) errs = append(errs, err)
} }
} }
return merr.NewErrors(errs...) return merr.NewErrors(errs...)
} }
@ -124,8 +125,14 @@ func (w *watcher) listFilesIn(base string, force bool) error {
if skipFile(files[path].Name(), skips) { if skipFile(files[path].Name(), skips) {
continue continue
} }
modTime := files[path].ModTime()
if !force && modTime.Equal(w.modTime[path]) {
continue
}
if err := w.deploy(path, !force); err != nil { if err := w.deploy(path, !force); err != nil {
errs = append(errs, errors2.Wrapf(err, "failed to process %s", path)) errs = append(errs, errors2.Wrapf(err, "failed to process %s", path))
} else {
w.modTime[path] = modTime
} }
} }