diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-16 14:53:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 14:53:40 +0100 |
| commit | 8430ffc72e74f1271174984674a1c2ee6118779e (patch) | |
| tree | a3c0542f0f8b218a55172177ae1a3497043f90f4 /libpod/network/cni/network.go | |
| parent | be681ab5189dea3eef73082d0b494699072e66aa (diff) | |
| parent | 295d87bb0b028e57dc2739791dee4820fe5fcc48 (diff) | |
| download | podman-8430ffc72e74f1271174984674a1c2ee6118779e.tar.gz podman-8430ffc72e74f1271174984674a1c2ee6118779e.tar.bz2 podman-8430ffc72e74f1271174984674a1c2ee6118779e.zip | |
Merge pull request #12283 from Luap99/machine-ports
podman machine improve port forwarding
Diffstat (limited to 'libpod/network/cni/network.go')
| -rw-r--r-- | libpod/network/cni/network.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/network/cni/network.go b/libpod/network/cni/network.go index 3e9cdaa47..41e3e414e 100644 --- a/libpod/network/cni/network.go +++ b/libpod/network/cni/network.go @@ -150,6 +150,13 @@ func (n *cniNetwork) loadNetworks() error { continue } + // podman < v4.0 used the podman-machine cni plugin for podman machine port forwarding + // since this is now build into podman we no longer use the plugin + // old configs may still contain it so we just remove it here + if n.isMachine { + conf = removeMachinePlugin(conf) + } + if _, err := n.cniConf.ValidateNetworkList(context.Background(), conf); err != nil { logrus.Warnf("Error validating CNI config file %s: %v", file, err) continue |