diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 11:37:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 11:37:45 -0400 |
| commit | e92b3830339cc9c8240d4553ccd23b3ec5578e4b (patch) | |
| tree | eb32501e758aed50f09d7a5bd23bde99e555ce61 /libpod/network/cni/cni_conversion.go | |
| parent | d88ed478cb6e422ee21a7ab9c99ece2d45bdfcab (diff) | |
| parent | af49810a6e08ed084294ce03e1c8a5efb8d1a705 (diff) | |
| download | podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.tar.gz podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.tar.bz2 podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.zip | |
Merge pull request #11629 from Luap99/CNI-1.0
Bump CNI to v1.0.1
Diffstat (limited to 'libpod/network/cni/cni_conversion.go')
| -rw-r--r-- | libpod/network/cni/cni_conversion.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/network/cni/cni_conversion.go b/libpod/network/cni/cni_conversion.go index d69dd7eb3..7a73b874a 100644 --- a/libpod/network/cni/cni_conversion.go +++ b/libpod/network/cni/cni_conversion.go @@ -14,7 +14,6 @@ import ( "time" "github.com/containernetworking/cni/libcni" - "github.com/containernetworking/cni/pkg/version" "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/libpod/network/util" pkgutil "github.com/containers/podman/v3/pkg/util" @@ -283,7 +282,10 @@ func (n *cniNetwork) createCNIConfigListFromNetwork(network *types.Network, writ ipMasq = false } // create CNI plugin configuration - ncList := newNcList(network.Name, version.Current(), network.Labels, network.Options) + // explicitly use CNI version 0.4.0 here, to use v1.0.0 at least containernetwork-plugins-1.0.1 has to be installed + // the dnsname plugin also needs to be updated for 1.0.0 + // TODO change to 1.0.0 when most distros support it + ncList := newNcList(network.Name, "0.4.0", network.Labels, network.Options) var plugins []interface{} switch network.Driver { |