vendor: bump to libcni v1.0-rc1
Signed-off-by: Casey Callendrello <cdc@redhat.com>
This commit is contained in:
5
vendor/github.com/containernetworking/cni/pkg/invoke/find.go
generated
vendored
5
vendor/github.com/containernetworking/cni/pkg/invoke/find.go
generated
vendored
@@ -18,6 +18,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// FindInPath returns the full path of the plugin by searching in the provided path
|
||||
@@ -26,6 +27,10 @@ func FindInPath(plugin string, paths []string) (string, error) {
|
||||
return "", fmt.Errorf("no plugin name provided")
|
||||
}
|
||||
|
||||
if strings.ContainsRune(plugin, os.PathSeparator) {
|
||||
return "", fmt.Errorf("invalid plugin name: %s", plugin)
|
||||
}
|
||||
|
||||
if len(paths) == 0 {
|
||||
return "", fmt.Errorf("no paths provided")
|
||||
}
|
||||
|
||||
1
vendor/github.com/containernetworking/cni/pkg/types/040/types.go
generated
vendored
1
vendor/github.com/containernetworking/cni/pkg/types/040/types.go
generated
vendored
@@ -183,6 +183,7 @@ func convertTo02x(from types.Result, toVersion string) (types.Result, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// 0.2.0 and earlier require at least one IP address in the Result
|
||||
if toResult.IP4 == nil && toResult.IP6 == nil {
|
||||
return nil, fmt.Errorf("cannot convert: no valid IP addresses")
|
||||
}
|
||||
|
||||
2
vendor/github.com/containernetworking/cni/pkg/types/internal/convert.go
generated
vendored
2
vendor/github.com/containernetworking/cni/pkg/types/internal/convert.go
generated
vendored
@@ -51,7 +51,7 @@ func findConverter(fromVersion, toVersion string) *converter {
|
||||
}
|
||||
|
||||
// Convert converts a CNI Result to the requested CNI specification version,
|
||||
// or returns an error if the converstion could not be performed or failed
|
||||
// or returns an error if the conversion could not be performed or failed
|
||||
func Convert(from types.Result, toVersion string) (types.Result, error) {
|
||||
fromVersion := from.Version()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user