diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-03 10:59:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 10:59:33 -0500 |
| commit | 70284b18cc7d4dc478c439cdda60ba64cfec060b (patch) | |
| tree | e8bdc4217c89c7891116da9977d8e4ec4848bd0e /vendor | |
| parent | c675d8a3c6335e495f7e0f055443a7acb63de911 (diff) | |
| parent | f00cc25a7c655022785389e6778693c6a7763bdc (diff) | |
| download | podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.gz podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.bz2 podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.zip | |
Merge pull request #8479 from rhatdan/log
Drop default log-level from error to warn
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go | 6 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go b/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go index ee09adc8d..7a9f97d1c 100644 --- a/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go +++ b/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go @@ -149,7 +149,7 @@ func (plugin *cniNetworkPlugin) monitorConfDir(start *sync.WaitGroup) { for { select { case event := <-plugin.watcher.Events: - logrus.Warningf("CNI monitoring event %v", event) + logrus.Infof("CNI monitoring event %v", event) var defaultDeleted bool createWrite := (event.Op&fsnotify.Create == fsnotify.Create || @@ -295,7 +295,7 @@ func loadNetworks(confDir string, cni *libcni.CNIConfig) (map[string]*cniNetwork } } if len(confList.Plugins) == 0 { - logrus.Warningf("CNI config list %s has no networks, skipping", confFile) + logrus.Infof("CNI config list %s has no networks, skipping", confFile) continue } @@ -350,7 +350,7 @@ func (plugin *cniNetworkPlugin) syncNetworkConfig() error { plugin.defaultNetName.name = defaultNetName logrus.Infof("Update default CNI network name to %s", defaultNetName) } else { - logrus.Warnf("Default CNI network name %s is unchangeable", plugin.defaultNetName.name) + logrus.Debugf("Default CNI network name %s is unchangeable", plugin.defaultNetName.name) } plugin.networks = networks diff --git a/vendor/modules.txt b/vendor/modules.txt index 9de30e604..19a87d31d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -220,7 +220,7 @@ github.com/coreos/go-systemd/v22/dbus github.com/coreos/go-systemd/v22/internal/dlopen github.com/coreos/go-systemd/v22/journal github.com/coreos/go-systemd/v22/sdjournal -# github.com/cri-o/ocicni v0.2.1-0.20201102180012-75c612fda1a2 => github.com/cri-o/ocicni v0.2.1-0.20201109200316-afdc16ba66df +# github.com/cri-o/ocicni v0.2.1-0.20201125151022-df072ea5421c github.com/cri-o/ocicni/pkg/ocicni # github.com/cyphar/filepath-securejoin v0.2.2 github.com/cyphar/filepath-securejoin |