diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-06-21 14:01:56 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2021-06-22 16:00:47 +0200 |
| commit | e014608539c251e917ff675b12b22c6f92f0deac (patch) | |
| tree | 4dec2d64590753734c1872da8a2d580aa3bf227f /go.mod | |
| parent | ed511d27d7d2198624dcda41b9e06e9e582e5c20 (diff) | |
| download | podman-e014608539c251e917ff675b12b22c6f92f0deac.tar.gz podman-e014608539c251e917ff675b12b22c6f92f0deac.tar.bz2 podman-e014608539c251e917ff675b12b22c6f92f0deac.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 'go.mod')
| -rw-r--r-- | go.mod | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ require ( github.com/containers/storage v1.32.3 github.com/coreos/go-systemd/v22 v22.3.2 github.com/coreos/stream-metadata-go v0.0.0-20210225230131-70edb9eb47b3 - github.com/cri-o/ocicni v0.2.1-0.20210301205850-541cf7c703cf + github.com/cri-o/ocicni v0.2.1-0.20210621164014-d0acc7862283 github.com/cyphar/filepath-securejoin v0.2.2 github.com/davecgh/go-spew v1.1.1 github.com/digitalocean/go-qemu v0.0.0-20210209191958-152a1535e49f |