rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Change the namespace to 'kube-system'

Browse Source
This commit is contained in:
Tomofumi Hayashi
2018-12-04 17:07:06 +09:00
committed by dougbtv
parent 2e070bd4a5
commit 3e2c4b1528
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.md
View File

@@ -53,7 +53,7 @@ User should chose following parameters combination (`clusterNetwork`+`defaultNet
Multus will find network for clusterNetwork/defaultNetworks as following sequences: 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. 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. 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 1. Multus failed to find network. Multus raise error message

2
k8sclient/k8sclient.go
View File

@@ -532,7 +532,7 @@ func GetPodNetwork(k8sclient KubeClient, k8sArgs *types.K8sArgs, confdir string)
func getDefaultNetDelegateCRD(client KubeClient, net string, confdir string) (*types.DelegateNetConf, error) { func getDefaultNetDelegateCRD(client KubeClient, net string, confdir string) (*types.DelegateNetConf, error) {
logging.Debugf("getDefaultNetDelegate: %v, %v, %s", client, net, confdir) 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) netData, err := client.GetRawWithPath(rawPath)
if err != nil { if err != nil {
return nil, logging.Errorf("getDefaultNetDelegate: failed to get network resource, refer Multus README.md for the usage guide: %v", err) return nil, logging.Errorf("getDefaultNetDelegate: failed to get network resource, refer Multus README.md for the usage guide: %v", err)

16
k8sclient/k8sclient_test.go
View File

@@ -294,8 +294,8 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}")
fKubeClient.AddPod(fakePod) fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}")
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)
@@ -325,9 +325,9 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}")
fKubeClient.AddNetConfig("kube-system", "myCRD2", "{\"type\": \"mynet2\"}")
fKubeClient.AddPod(fakePod) fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}")
fKubeClient.AddNetConfig("default", "myCRD2", "{\"type\": \"mynet2\"}")
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)
@@ -361,9 +361,9 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddNetConfig("kube-system", "myCRD1", "{\"type\": \"mynet\"}")
fKubeClient.AddNetConfig("kube-system", "myCRD2", "{\"type\": \"mynet2\"}")
fKubeClient.AddPod(fakePod) fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig("default", "myCRD1", "{\"type\": \"mynet\"}")
fKubeClient.AddNetConfig("default", "myCRD2", "{\"type\": \"mynet2\"}")
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)
@@ -428,13 +428,13 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddPod(fakePod)
net1Name := filepath.Join(tmpDir, "10-net1.conf") net1Name := filepath.Join(tmpDir, "10-net1.conf")
fKubeClient.AddNetFile(fakePod.ObjectMeta.Namespace, "10-net1", net1Name, `{ fKubeClient.AddNetFile(fakePod.ObjectMeta.Namespace, "10-net1", net1Name, `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}`) }`)
fKubeClient.AddPod(fakePod)
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)
@@ -490,9 +490,9 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") 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) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)