faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-29 10:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to containerd v1.6.4

Browse Source 
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2022-05-25 11:22:51 +01:00
committed by Alex Ellis
parent fee46de596
commit 02e9b9961b
93 changed files with 1145 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/containernetworking/cni/libcni/conf.go generated vendored
View File

@ -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 == "" {