github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-14 22:34:54 +00:00
Code Issues Projects Releases Wiki Activity

k8sclient: default network resource namespace to pod's namespace

Browse Source 
Instead of 'default'.
This commit is contained in:
Dan Williams 2018-06-14 22:31:22 -05:00 committed by Kuralamudhan Ramakrishnan
parent ac9e46f712
commit fa9f209fed
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
k8sclient/k8sclient.go
View File

@ -70,16 +70,15 @@ func createK8sClient(kubeconfig string) (KubeClient, error) {
return &defaultKubeClient{client: client}, nil return &defaultKubeClient{client: client}, nil
} }
func getPodNetworkAnnotation(client KubeClient, k8sArgs types.K8sArgs) (string, error) { func getPodNetworkAnnotation(client KubeClient, k8sArgs types.K8sArgs) (string, string, error) {
var annot string
var err error var err error
pod, err := client.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) pod, err := client.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME))
if err != nil { if err != nil {
return annot, fmt.Errorf("getPodNetworkAnnotation: failed to query the pod %v in out of cluster comm: %v", string(k8sArgs.K8S_POD_NAME), err) return "", "", fmt.Errorf("getPodNetworkAnnotation: failed to query the pod %v in out of cluster comm: %v", string(k8sArgs.K8S_POD_NAME), err)
} }
return pod.Annotations["kubernetes.v1.cni.cncf.io/networks"], nil return pod.Annotations["kubernetes.v1.cni.cncf.io/networks"], pod.ObjectMeta.Namespace, nil
} }
func parsePodNetworkObjectName(podnetwork string) (string, string, string, error) { func parsePodNetworkObjectName(podnetwork string) (string, string, string, error) {
@ -288,13 +287,13 @@ func getNetObject(net types.Network, primary bool, ifname string, confdir string
return config, nil return config, nil
} }
func getnetplugin(client KubeClient, networkinfo map[string]interface{}, primary bool, confdir string) (string, error) { func getnetplugin(client KubeClient, networkinfo map[string]interface{}, primary bool, confdir, defaultNamespace string) (string, error) {
networkname := networkinfo["name"].(string) 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")
} }
netNsName := "default" netNsName := defaultNamespace
if networkinfo["namespace"] != nil { if networkinfo["namespace"] != nil {
netNsName = networkinfo["namespace"].(string) netNsName = networkinfo["namespace"].(string)
} }
@ -324,7 +323,7 @@ func getnetplugin(client KubeClient, networkinfo map[string]interface{}, primary
return netargs, nil return netargs, nil
} }
func getPodNetworkObj(client KubeClient, netObjs []map[string]interface{}, confdir string) (string, error) { func getPodNetworkObj(client KubeClient, netObjs []map[string]interface{}, confdir, defaultNamespace string) (string, error) {
var np string var np string
var err error var err error
@ -339,7 +338,7 @@ func getPodNetworkObj(client KubeClient, netObjs []map[string]interface{}, confd
primary = true primary = true
} }
np, err = getnetplugin(client, net, primary, confdir) np, err = getnetplugin(client, net, primary, confdir, defaultNamespace)
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)
} }
@ -392,7 +391,7 @@ func GetK8sNetwork(args *skel.CmdArgs, kubeconfig string, k8sclient KubeClient,
} }
} }
netAnnot, err := getPodNetworkAnnotation(k8sclient, k8sArgs) netAnnot, defaultNamespace, err := getPodNetworkAnnotation(k8sclient, k8sArgs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -406,7 +405,7 @@ func GetK8sNetwork(args *skel.CmdArgs, kubeconfig string, k8sclient KubeClient,
return nil, err return nil, err
} }
multusDelegates, err := getPodNetworkObj(k8sclient, netObjs, confdir) multusDelegates, err := getPodNetworkObj(k8sclient, netObjs, confdir, defaultNamespace)
if err != nil { if err != nil {
return nil, err return nil, err
} }