github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-11 13:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Support '@<ifname>' in network annotation.

Browse Source
This commit is contained in:
Tomofumi Hayashi 2018-03-15 14:18:31 +09:00
parent 3e611010eb
commit 633ddf384d
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
multus/multus.go
View File

@ -209,6 +209,12 @@ func delegateAdd(podif func() string, argif string, netconf map[string]interface
} }
} }
if netconf["ifnameRequest"] != nil {
if os.Setenv("CNI_IFNAME", netconf["ifnameRequest"].(string)) != nil {
return true, fmt.Errorf("Multus: error in setting CNI_IFNAME")
}
}
result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes) result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
if err != nil { if err != nil {
return true, fmt.Errorf("Multus: error in invoke Delegate add - %q: %v", netconf["type"].(string), err) return true, fmt.Errorf("Multus: error in invoke Delegate add - %q: %v", netconf["type"].(string), err)
@ -309,8 +315,13 @@ func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error)
// Build a map from the comma delimited items. // Build a map from the comma delimited items.
commaItems := strings.Split(podnetwork, ",") commaItems := strings.Split(podnetwork, ",")
for i := range commaItems { for i := range commaItems {
netName := strings.TrimSpace(commaItems[i])
atItems := strings.Split(netName, "@")
m := make(map[string]interface{}) m := make(map[string]interface{})
m["name"] = commaItems[i] m["name"] = atItems[0]
if len(atItems) == 2 {
m["interfaceRequest"] = atItems[1]
}
podNet = append(podNet,m) podNet = append(podNet,m)
} }
} }
@ -323,7 +334,7 @@ func isJSON(str string) bool {
return json.Unmarshal([]byte(str), &js) == nil return json.Unmarshal([]byte(str), &js) == nil
} }
func getpluginargs(name string, args string, primary bool) (string, error) { func getpluginargs(name string, args string, primary bool, ifname string) (string, error) {
var netconf string var netconf string
var tmpargs []string var tmpargs []string
@ -332,11 +343,16 @@ func getpluginargs(name string, args string, primary bool) (string, error) {
} }
if primary != false { if primary != false {
tmpargs = []string{`{"type": "`, name, `","masterplugin": true,`, args[strings.Index(args, "\"") : len(args)-1]} tmpargs = []string{`{"type": "`, name, `","masterplugin": true,`}
} else { } else {
tmpargs = []string{`{"type": "`, name, `",`, args[strings.Index(args, "\"") : len(args)-1]} tmpargs = []string{`{"type": "`, name, `",`}
} }
if ifname != "" {
tmpargs = append(tmpargs, fmt.Sprintf(`"ifnameRequest": "%s",`, ifname))
}
tmpargs = append(tmpargs, args[strings.Index(args, "\"") : len(args)-1])
var str bytes.Buffer var str bytes.Buffer
for _, a := range tmpargs { for _, a := range tmpargs {
@ -348,7 +364,8 @@ func getpluginargs(name string, args string, primary bool) (string, error) {
} }
func getnetplugin(client *kubernetes.Clientset, networkname string, primary bool) (string, error) { func getnetplugin(client *kubernetes.Clientset, networkinfo map[string]interface{}, primary bool) (string, error) {
networkname := networkinfo["name"].(string)
if networkname == "" { if networkname == "" {
return "", fmt.Errorf("getnetplugin: network name can't be empty") return "", fmt.Errorf("getnetplugin: network name can't be empty")
} }
@ -365,7 +382,12 @@ func getnetplugin(client *kubernetes.Clientset, networkname string, primary bool
return "", fmt.Errorf("getnetplugin: failed to get the netplugin data: %v", err) return "", fmt.Errorf("getnetplugin: failed to get the netplugin data: %v", err)
} }
netargs, err := getpluginargs(np.Plugin, np.Args, primary) ifnameRequest := ""
if networkinfo["interfaceRequest"] != nil {
ifnameRequest = networkinfo["interfaceRequest"].(string)
}
netargs, err := getpluginargs(np.Plugin, np.Args, primary, ifnameRequest)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -388,7 +410,7 @@ func getPodNetworkObj(client *kubernetes.Clientset, netObjs []map[string]interfa
primary = true primary = true
} }
np, err = getnetplugin(client, net["name"].(string), primary) np, err = getnetplugin(client, net, primary)
if err != nil { if err != nil {
return "", fmt.Errorf("getPodNetworkObj: failed in getting the netplugin: %v", err) return "", fmt.Errorf("getPodNetworkObj: failed in getting the netplugin: %v", err)
} }