multus: update for CNI 0.7.0-alpha1 release

This commit is contained in:
Dan Williams
2018-06-13 15:14:02 -05:00
committed by Kuralamudhan Ramakrishnan
parent 92a8b1c1c9
commit 7597640a21
3 changed files with 41 additions and 3 deletions

View File

@@ -19,12 +19,19 @@ import (
"net"
"github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/types/current"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
// NetConf for cni config file written in json
type NetConf struct {
types.NetConf
// support chaining for master interface and IP decisions
// occurring prior to running ipvlan plugin
RawPrevResult *map[string]interface{} `json:"prevResult"`
PrevResult *current.Result `json:"-"`
ConfDir string `json:"confDir"`
CNIDir string `json:"cniDir"`
// RawDelegates is private to the NetConf class; use Delegates instead