github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-06 20:28:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from redhat-nfvpe/dev/comma_delimited

Browse Source 
implements comma delimited + json scheme
This commit is contained in:
Tomofumi Hayashi 2018-03-13 21:01:24 +09:00 committed by GitHub
commit 98d17c1878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
multus/multus.go
View File

@ -288,7 +288,7 @@ func getPodNetworkAnnotation(client *kubernetes.Clientset, k8sArgs K8sArgs) (str
return annot, fmt.Errorf("getPodNetworkAnnotation: failed to query the pod %v in out of cluster comm", string(k8sArgs.K8S_POD_NAME)) return annot, fmt.Errorf("getPodNetworkAnnotation: failed to query the pod %v in out of cluster comm", string(k8sArgs.K8S_POD_NAME))
} }
return pod.Annotations["networks"], nil return pod.Annotations["kubernetes.cni.cncf.io/networks"], nil
} }
func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error) { func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error) {
@ -298,8 +298,16 @@ func parsePodNetworkObject(podnetwork string) ([]map[string]interface{}, error)
return nil, fmt.Errorf("parsePodNetworkObject: pod annotation not having \"network\" as key, refer Multus README.md for the usage guide") return nil, fmt.Errorf("parsePodNetworkObject: pod annotation not having \"network\" as key, refer Multus README.md for the usage guide")
} }
// Parse the podnetwork string, and assume it is JSON.
if err := json.Unmarshal([]byte(podnetwork), &podNet); err != nil { if err := json.Unmarshal([]byte(podnetwork), &podNet); err != nil {
return nil, fmt.Errorf("parsePodNetworkObject: failed to load pod network err: %v | pod network: %v", err, podnetwork) // If the JSON parsing fails, assume it is comma delimited.
commaItems := strings.Split(podnetwork, ",")
// Build a map from the comma delimited items.
for i := range commaItems {
m := make(map[string]interface{})
m["name"] = strings.TrimSpace(commaItems[i])
podNet = append(podNet,m)
}
} }
return podNet, nil return podNet, nil
@ -335,7 +343,7 @@ func getnetplugin(client *kubernetes.Clientset, networkname string, primary bool
return "", fmt.Errorf("getnetplugin: network name can't be empty") return "", fmt.Errorf("getnetplugin: network name can't be empty")
} }
tprclient := fmt.Sprintf("/apis/cni.cncf.io/v1/namespaces/default/kubernetes-network/%s", networkname) tprclient := fmt.Sprintf("/apis/cni.cncf.io/v1/namespaces/default/networks/%s", networkname)
netobjdata, err := client.ExtensionsV1beta1().RESTClient().Get().AbsPath(tprclient).DoRaw() netobjdata, err := client.ExtensionsV1beta1().RESTClient().Get().AbsPath(tprclient).DoRaw()
if err != nil { if err != nil {