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

clusterNetwork/defaultNetworks and namespace spec fixed

Browse Source 
This fix is to add declaration about clusterNetwork/defaultNetwork
net-attach-def is in 'default' namesspace. In addition, this code
changes to skip defaultNetwork in case of 'kube-system' namespace
as well (#202).
This commit is contained in:
Tomofumi Hayashi
2018-11-30 16:33:09 +09:00
committed by Tomofumi Hayashi
parent 887a9f42dd
commit e05de6260b
3 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
k8sclient/k8sclient.go
View File

@@ -621,13 +621,15 @@ func GetDefaultNetworks(k8sArgs *types.K8sArgs, conf *types.NetConf, kubeClient
delegate.MasterPlugin = true
delegates = append(delegates, delegate)
//need to revisit
for _, netname := range conf.DefaultNetworks {
delegate, err := getNetDelegate(kubeClient, netname, conf.ConfDir)
if err != nil {
return err
// Pod in kube-system namespace does not have default network for now.
if string(k8sArgs.K8S_POD_NAMESPACE) != "kube-system" {
for _, netname := range conf.DefaultNetworks {
delegate, err := getNetDelegate(kubeClient, netname, conf.ConfDir)
if err != nil {
return err
}
delegates = append(delegates, delegate)
}
delegates = append(delegates, delegate)
}
if err = conf.AddDelegates(delegates); err != nil {