diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-06-21 14:01:56 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-06-24 13:39:24 -0400 |
| commit | 949573c5a879e2486fb14984b77660a347b78403 (patch) | |
| tree | 1fbe0a3e162c0ab8ff7f56c7326a708fc4e93984 /libpod/runtime.go | |
| parent | ab5e770c4b2bd0933f7a965e7b455ea0a7cdbfa3 (diff) | |
| download | podman-949573c5a879e2486fb14984b77660a347b78403.tar.gz podman-949573c5a879e2486fb14984b77660a347b78403.tar.bz2 podman-949573c5a879e2486fb14984b77660a347b78403.zip | |
Do not use inotify for OCICNI
Podman does not need to watch the cni config directory. If a network is
not found in the cache, OCICNI will reload the networks anyway and thus
even podman system service should work as expected.
Also include a change to not mount a "new" /var by default in the
rootless cni ns, instead try to use /var/lib/cni first and then the
parent dir. This allows users to store cni configs under /var/... which
is the case for the CI compose test.
[NO TESTS NEEDED]
Fixes #10686
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 2cf2b3f79..f0c85df3b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -458,7 +458,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) { } // Set up the CNI net plugin - netPlugin, err := ocicni.InitCNI(runtime.config.Network.DefaultNetwork, runtime.config.Network.NetworkConfigDir, runtime.config.Network.CNIPluginDirs...) + netPlugin, err := ocicni.InitCNINoInotify(runtime.config.Network.DefaultNetwork, runtime.config.Network.NetworkConfigDir, "", runtime.config.Network.CNIPluginDirs...) if err != nil { return errors.Wrapf(err, "error configuring CNI network plugin") } |