From 0cfe05690aeb25d3e8dfb4b1883d281aa4b8d204 Mon Sep 17 00:00:00 2001 From: roman-kiselenko Date: Sat, 9 Nov 2024 15:02:54 +0200 Subject: [PATCH] Log events only related to a valid CNI configuration file. Logs only .conf, .json and .conflist files. Signed-off-by: roman-kiselenko --- pkg/ocicni/ocicni.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/ocicni/ocicni.go b/pkg/ocicni/ocicni.go index 8ad481b..cd69654 100644 --- a/pkg/ocicni/ocicni.go +++ b/pkg/ocicni/ocicni.go @@ -22,6 +22,8 @@ import ( "github.com/sirupsen/logrus" ) +var cniConfigExtensions = []string{".conf", ".conflist", ".json"} + type cniNetworkPlugin struct { cniConfig *libcni.CNIConfig @@ -155,10 +157,16 @@ func (plugin *cniNetworkPlugin) monitorConfDir(ctx context.Context, start *sync. start.Done() plugin.done.Add(1) defer plugin.done.Done() + exts := map[string]bool{} + for _, ext := range cniConfigExtensions { + exts[ext] = true + } for { select { case event := <-plugin.watcher.Events: - logrus.Infof("CNI monitoring event %v", event) + if exts[filepath.Ext(event.Name)] { + logrus.Infof("CNI monitoring event %v", event) + } var defaultDeleted bool createWriteRename := event.Op&fsnotify.Create == fsnotify.Create || @@ -287,7 +295,7 @@ func (plugin *cniNetworkPlugin) Shutdown() error { } func loadNetworks(ctx context.Context, confDir string, cni *libcni.CNIConfig) (networks map[string]*cniNetwork, defaultNetName string, err error) { - files, err := libcni.ConfFiles(confDir, []string{".conf", ".conflist", ".json"}) + files, err := libcni.ConfFiles(confDir, cniConfigExtensions) if err != nil { return nil, "", err }