Support CNI 1.0.0

Fix #792
2022-03-02 01:55:23 +09:00
parent ecc98be9c6
commit 93ec0c121e
835 changed files with 80172 additions and 36848 deletions
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -19,7 +19,7 @@ import (
 	"net"

 	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/types/current"
+	cni100 "github.com/containernetworking/cni/pkg/types/100"
 	v1 "k8s.io/api/core/v1"
 )

@@ -30,7 +30,7 @@ type NetConf struct {
 	// support chaining for master interface and IP decisions
 	// occurring prior to running ipvlan plugin
 	RawPrevResult *map[string]interface{} `json:"prevResult"`
-	PrevResult    *current.Result         `json:"-"`
+	PrevResult    *cni100.Result         `json:"-"`

 	ConfDir string `json:"confDir"`
 	CNIDir  string `json:"cniDir"`