diff --git a/doc/configuration.md b/doc/configuration.md index bcc5a91f8..5534f4ad4 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -53,7 +53,7 @@ User should chose following parameters combination (`clusterNetwork`+`defaultNet Multus will find network for clusterNetwork/defaultNetworks as following sequences: -1. CRD object for given network name, in 'default' namespace +1. CRD object for given network name, in 'kube-system' namespace 1. CNI json config file in `confDir`. Given name should be without extention, like .conf/.conflist. (e.g. "test" for "test.conf") 1. Directory for CNI json config file. Multus will find alphabetically first file for the network 1. Multus failed to find network. Multus raise error message diff --git a/k8sclient/k8sclient.go b/k8sclient/k8sclient.go index d2dde5f7e..d599f7284 100644 --- a/k8sclient/k8sclient.go +++ b/k8sclient/k8sclient.go @@ -532,7 +532,7 @@ func GetPodNetwork(k8sclient KubeClient, k8sArgs *types.K8sArgs, confdir string) func getDefaultNetDelegateCRD(client KubeClient, net string, confdir string) (*types.DelegateNetConf, error) { logging.Debugf("getDefaultNetDelegate: %v, %v, %s", client, net, confdir) - rawPath := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", "default", net) + rawPath := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", "kube-system", net) netData, err := client.GetRawWithPath(rawPath) if err != nil { return nil, logging.Errorf("getDefaultNetDelegate: failed to get network resource, refer Multus README.md for the usage guide: %v", err) diff --git a/k8sclient/k8sclient_test.go b/k8sclient/k8sclient_test.go index 153eb9d9a..f6f4c9a13 100644 --- a/k8sclient/k8sclient_test.go +++ b/k8sclient/k8sclient_test.go @@ -294,8 +294,8 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() + fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}") fKubeClient.AddPod(fakePod) - fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}") kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args) @@ -325,9 +325,9 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() + fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}") + fKubeClient.AddNetConfig("kube-system", "myCRD2", "{\"type\": \"mynet2\"}") fKubeClient.AddPod(fakePod) - fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}") - fKubeClient.AddNetConfig("default", "myCRD2", "{\"type\": \"mynet2\"}") kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args) @@ -361,9 +361,9 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() + fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}") + fKubeClient.AddNetConfig("kube-system", "myCRD2", "{\"type\": \"mynet2\"}") fKubeClient.AddPod(fakePod) - fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}") - fKubeClient.AddNetConfig("default", "myCRD2", "{\"type\": \"mynet2\"}") kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args) @@ -428,13 +428,13 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() - fKubeClient.AddPod(fakePod) net1Name := filepath.Join(tmpDir, "10-net1.conf") fKubeClient.AddNetFile(fakePod.ObjectMeta.Namespace, "10-net1", net1Name, `{ "name": "net1", "type": "mynet", "cniVersion": "0.2.0" }`) + fKubeClient.AddPod(fakePod) kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args) @@ -490,9 +490,9 @@ var _ = Describe("k8sclient operations", func() { } fKubeClient := testutils.NewFakeKubeClient() - fKubeClient.AddPod(fakePod) fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") - fKubeClient.AddNetConfig("default", "net2", "{\"type\": \"mynet2\"}") + fKubeClient.AddNetConfig("kube-system", "net2", "{\"type\": \"mynet2\"}") + fKubeClient.AddPod(fakePod) kubeClient, err := GetK8sClient("", fKubeClient) Expect(err).NotTo(HaveOccurred()) k8sArgs, err := GetK8sArgs(args)