diff options
author | Dan Williams <dcbw@redhat.com> | 2020-03-06 09:58:37 -0600 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2020-03-06 10:03:27 -0600 |
commit | 74ddc0b6967bd0e40c901e077880a02a59733dcc (patch) | |
tree | 07ca5867fb16f39f0a77f6896f076ee5a73a9e40 /vendor/github.com/containernetworking/cni/libcni | |
parent | f07e18f05c07026e4544788a1359122c81adcde7 (diff) | |
download | podman-74ddc0b6967bd0e40c901e077880a02a59733dcc.tar.gz podman-74ddc0b6967bd0e40c901e077880a02a59733dcc.tar.bz2 podman-74ddc0b6967bd0e40c901e077880a02a59733dcc.zip |
vendor: update github.com/containernetworking/cni to v0.7.2-0.20200304161608-4fae32b84921
Specifically to get:
https://github.com/containernetworking/cni/pull/735
6f29b0165883b2b52ccd4dcb937162ea4c86927b intercept netplugin std err
But also pulls in some interface name validation and a compatibility
fix for configurations that don't set a CNI version.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Diffstat (limited to 'vendor/github.com/containernetworking/cni/libcni')
-rw-r--r-- | vendor/github.com/containernetworking/cni/libcni/api.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vendor/github.com/containernetworking/cni/libcni/api.go b/vendor/github.com/containernetworking/cni/libcni/api.go index 22b111742..7e52bd838 100644 --- a/vendor/github.com/containernetworking/cni/libcni/api.go +++ b/vendor/github.com/containernetworking/cni/libcni/api.go @@ -409,6 +409,9 @@ func (c *CNIConfig) addNetwork(ctx context.Context, name, cniVersion string, net if err := utils.ValidateNetworkName(name); err != nil { return nil, err } + if err := utils.ValidateInterfaceName(rt.IfName); err != nil { + return nil, err + } newConf, err := buildOneConfig(name, cniVersion, net, prevResult, rt) if err != nil { @@ -629,6 +632,9 @@ func (c *CNIConfig) validatePlugin(ctx context.Context, pluginName, expectedVers if err != nil { return err } + if expectedVersion == "" { + expectedVersion = "0.1.0" + } vi, err := invoke.GetVersionInfo(ctx, pluginPath, c.exec) if err != nil { |