diff options
author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2022-04-28 12:09:13 +0000 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2022-05-03 13:38:54 -0400 |
commit | 8627b5151079cde65594c0c1588cdd5c1114ff94 (patch) | |
tree | 93e7106b282e191216c580b72f6a8866cde9ac19 /vendor/github.com | |
parent | 9f6131e9c014cebac422c9f1e8def3bfe4ad8330 (diff) | |
download | podman-8627b5151079cde65594c0c1588cdd5c1114ff94.tar.gz podman-8627b5151079cde65594c0c1588cdd5c1114ff94.tar.bz2 podman-8627b5151079cde65594c0c1588cdd5c1114ff94.zip |
Bump github.com/containernetworking/cni from 1.0.1 to 1.1.0
Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/containernetworking/cni/releases)
- [Commits](https://github.com/containernetworking/cni/compare/v1.0.1...v1.1.0)
---
updated-dependencies:
- dependency-name: github.com/containernetworking/cni
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r-- | vendor/github.com/containernetworking/cni/libcni/conf.go | 6 | ||||
-rw-r--r-- | vendor/github.com/containernetworking/cni/pkg/version/plugin.go | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/vendor/github.com/containernetworking/cni/libcni/conf.go b/vendor/github.com/containernetworking/cni/libcni/conf.go index d28135ff3..3cd6a59d1 100644 --- a/vendor/github.com/containernetworking/cni/libcni/conf.go +++ b/vendor/github.com/containernetworking/cni/libcni/conf.go @@ -21,6 +21,8 @@ import ( "os" "path/filepath" "sort" + + "github.com/containernetworking/cni/pkg/types" ) type NotFoundError struct { @@ -41,8 +43,8 @@ func (e NoConfigsFoundError) Error() string { } func ConfFromBytes(bytes []byte) (*NetworkConfig, error) { - conf := &NetworkConfig{Bytes: bytes} - if err := json.Unmarshal(bytes, &conf.Network); err != nil { + conf := &NetworkConfig{Bytes: bytes, Network: &types.NetConf{}} + if err := json.Unmarshal(bytes, conf.Network); err != nil { return nil, fmt.Errorf("error parsing configuration: %w", err) } if conf.Network.Type == "" { diff --git a/vendor/github.com/containernetworking/cni/pkg/version/plugin.go b/vendor/github.com/containernetworking/cni/pkg/version/plugin.go index d4bc9d169..17b22b6b0 100644 --- a/vendor/github.com/containernetworking/cni/pkg/version/plugin.go +++ b/vendor/github.com/containernetworking/cni/pkg/version/plugin.go @@ -86,8 +86,8 @@ func (*PluginDecoder) Decode(jsonBytes []byte) (PluginInfo, error) { // minor, and micro numbers or returns an error func ParseVersion(version string) (int, int, int, error) { var major, minor, micro int - if version == "" { - return -1, -1, -1, fmt.Errorf("invalid version %q: the version is empty", version) + if version == "" { // special case: no version declared == v0.1.0 + return 0, 1, 0, nil } parts := strings.Split(version, ".") |