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

Change ClusterNetwork/DefaultNetwork namespace to MultusNamespace

Browse Source 
Fix #261.
This commit is contained in:
Tomofumi Hayashi
2019-02-22 11:50:37 +09:00
committed by dougbtv
parent 61f9e08863
commit 68c5d0dd70
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
k8sclient/k8sclient.go
View File

@@ -544,7 +544,7 @@ func GetPodNetwork(k8sclient KubeClient, k8sArgs *types.K8sArgs, confdir string,
} }
func getDefaultNetDelegateCRD(client KubeClient, net, confdir, namespace string) (*types.DelegateNetConf, error) { 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) rawPath := fmt.Sprintf("/apis/k8s.cni.cncf.io/v1/namespaces/%s/network-attachment-definitions/%s", namespace, net)
netData, err := client.GetRawWithPath(rawPath) netData, err := client.GetRawWithPath(rawPath)
if err != nil { 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) { 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 // option1) search CRD object for the network
delegate, err := getDefaultNetDelegateCRD(client, netname, confdir, namespace) delegate, err := getDefaultNetDelegateCRD(client, netname, confdir, namespace)
if err == nil { if err == nil {
@@ -681,8 +681,8 @@ func tryLoadK8sPodDefaultNetwork(k8sArgs *types.K8sArgs, conf *types.NetConf, ku
return nil, nil return nil, nil
} }
// The CRD object of default network should only be defined in default namespace // The CRD object of default network should only be defined in multusNamespace
networks, err := parsePodNetworkAnnotation(netAnnot, "default") networks, err := parsePodNetworkAnnotation(netAnnot, conf.MultusNamespace)
if err != nil { if err != nil {
return nil, logging.Errorf("tryLoadK8sPodDefaultNetwork: failed to parse CRD object: %v", err) return nil, logging.Errorf("tryLoadK8sPodDefaultNetwork: failed to parse CRD object: %v", err)
} }

5
k8sclient/k8sclient_test.go
View File

@@ -480,6 +480,7 @@ var _ = Describe("k8sclient operations", func() {
"name":"node-cni-network", "name":"node-cni-network",
"type":"multus", "type":"multus",
"clusterNetwork": "net2", "clusterNetwork": "net2",
"multusNamespace" : "kube-system",
"kubeconfig":"/etc/kubernetes/node-kubeconfig.yaml" "kubeconfig":"/etc/kubernetes/node-kubeconfig.yaml"
}` }`
netConf, err := types.LoadNetConf([]byte(conf)) netConf, err := types.LoadNetConf([]byte(conf))
@@ -490,7 +491,7 @@ var _ = Describe("k8sclient operations", func() {
} }
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") fKubeClient.AddNetConfig("kube-system", "net1", "{\"type\": \"mynet1\"}")
fKubeClient.AddNetConfig("kube-system", "net2", "{\"type\": \"mynet2\"}") fKubeClient.AddNetConfig("kube-system", "net2", "{\"type\": \"mynet2\"}")
fKubeClient.AddPod(fakePod) fKubeClient.AddPod(fakePod)
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
@@ -534,7 +535,7 @@ var _ = Describe("k8sclient operations", func() {
fKubeClient := testutils.NewFakeKubeClient() fKubeClient := testutils.NewFakeKubeClient()
fKubeClient.AddPod(fakePod) fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig("default", "net1", "{\"type\": \"mynet1\"}") fKubeClient.AddNetConfig("kube-system", "net1", "{\"type\": \"mynet1\"}")
kubeClient, err := GetK8sClient("", fKubeClient) kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args) k8sArgs, err := GetK8sArgs(args)