diff --git a/k8sclient/k8sclient.go b/k8sclient/k8sclient.go index dc735ff06..1e2739340 100644 --- a/k8sclient/k8sclient.go +++ b/k8sclient/k8sclient.go @@ -544,7 +544,7 @@ func GetPodNetwork(k8sclient KubeClient, k8sArgs *types.K8sArgs, confdir string, } func getDefaultNetDelegateCRD(client KubeClient, net, confdir, namespace string) (*types.DelegateNetConf, error) { - logging.Debugf("getDefaultNetDelegate: %v, %v, %s", client, net, confdir) + logging.Debugf("getDefaultNetDelegateCRD: %v, %v, %s, %s", client, net, confdir, namespace) rawPath := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", namespace, net) netData, err := client.GetRawWithPath(rawPath) if err != nil { @@ -570,7 +570,7 @@ func getDefaultNetDelegateCRD(client KubeClient, net, confdir, namespace string) } func getNetDelegate(client KubeClient, netname, confdir, namespace string) (*types.DelegateNetConf, error) { - logging.Debugf("getNetDelegate: %v, %v, %v", client, netname, confdir) + logging.Debugf("getNetDelegate: %v, %v, %v, %s", client, netname, confdir, namespace) // option1) search CRD object for the network delegate, err := getDefaultNetDelegateCRD(client, netname, confdir, namespace) if err == nil { @@ -681,8 +681,8 @@ func tryLoadK8sPodDefaultNetwork(k8sArgs *types.K8sArgs, conf *types.NetConf, ku return nil, nil } - // The CRD object of default network should only be defined in default namespace - networks, err := parsePodNetworkAnnotation(netAnnot, "default") + // The CRD object of default network should only be defined in multusNamespace + networks, err := parsePodNetworkAnnotation(netAnnot, conf.MultusNamespace) if err != nil { return nil, logging.Errorf("tryLoadK8sPodDefaultNetwork: failed to parse CRD object: %v", err) } diff --git a/k8sclient/k8sclient_test.go b/k8sclient/k8sclient_test.go index 6e266fef0..323d891cd 100644 --- a/k8sclient/k8sclient_test.go +++ b/k8sclient/k8sclient_test.go @@ -480,6 +480,7 @@ var _ = Describe("k8sclient operations", func() { "name":"node-cni-network", "type":"multus", "clusterNetwork": "net2", + "multusNamespace" : "kube-system", "kubeconfig":"/etc/kubernetes/node-kubeconfig.yaml" }` netConf, err := types.LoadNetConf([]byte(conf)) @@ -490,7 +491,7 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() - fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") + fKubeClient.AddNetConfig("kube-system", "net1", "{\"type\": \"mynet1\"}") fKubeClient.AddNetConfig("kube-system", "net2", "{\"type\": \"mynet2\"}") fKubeClient.AddPod(fakePod) kubeClient, err := GetK8sClient("", fKubeClient) @@ -534,7 +535,7 @@ var _ = Describe("k8sclient operations", func() { fKubeClient := testutils.NewFakeKubeClient() fKubeClient.AddPod(fakePod) - fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") + fKubeClient.AddNetConfig("kube-system", "net1", "{\"type\": \"mynet1\"}") kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args)