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/pkg/types/020/types.go | |
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/pkg/types/020/types.go')
-rw-r--r-- | vendor/github.com/containernetworking/cni/pkg/types/020/types.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vendor/github.com/containernetworking/cni/pkg/types/020/types.go b/vendor/github.com/containernetworking/cni/pkg/types/020/types.go index 53256167f..36f31678a 100644 --- a/vendor/github.com/containernetworking/cni/pkg/types/020/types.go +++ b/vendor/github.com/containernetworking/cni/pkg/types/020/types.go @@ -86,20 +86,6 @@ func (r *Result) PrintTo(writer io.Writer) error { return err } -// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where -// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the -// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string. -func (r *Result) String() string { - var str string - if r.IP4 != nil { - str = fmt.Sprintf("IP4:%+v, ", *r.IP4) - } - if r.IP6 != nil { - str += fmt.Sprintf("IP6:%+v, ", *r.IP6) - } - return fmt.Sprintf("%sDNS:%+v", str, r.DNS) -} - // IPConfig contains values necessary to configure an interface type IPConfig struct { IP net.IPNet |