containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13184 from Luap99/cni-dir 

Do not set the network config dir to cni plugin dir
This commit is contained in:
OpenShift Merge Robot 2022-02-09 14:51:53 -05:00 committed by GitHub
parent cd9ec7f7c3 3762946e63
commit 12836a5610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/registry/config.go
View File

@ -81,11 +81,6 @@ func newPodmanConfig() {
mode = entities.TunnelMode
}
cfg.Network.NetworkConfigDir = cfg.Network.CNIPluginDirs[0]
if rootless.IsRootless() {
cfg.Network.NetworkConfigDir = ""
}
podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode}
}