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

Add clusterNetwork/defaultNetwork into multus

Browse Source 
To support CRD/file/directory, add clusterNetwork/defaultNetwork
in multus.conf file.
This commit is contained in:
Tomofumi Hayashi 2018-10-11 17:57:20 +09:00 committed by dougbtv
parent 55792b94d5
commit 6b0266148b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
k8sclient/k8sclient.go
View File

@ -536,7 +536,7 @@ func getDefaultNetDelegateCRD(client KubeClient, net string, confdir string) (*t
return nil, err return nil, err
} }
delegate, err := types.LoadDelegateNetConf(configBytes, "") delegate, err := types.LoadDelegateNetConf(configBytes, "", "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -556,7 +556,7 @@ func getNetDelegate(client KubeClient, netname string, confdir string) (*types.D
var configBytes []byte var configBytes []byte
configBytes, err = getCNIConfigFromFile(netname, confdir) configBytes, err = getCNIConfigFromFile(netname, confdir)
if err == nil { if err == nil {
delegate, err := types.LoadDelegateNetConf(configBytes, "") delegate, err := types.LoadDelegateNetConf(configBytes, "", "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -572,7 +572,7 @@ func getNetDelegate(client KubeClient, netname string, confdir string) (*types.D
var configBytes []byte var configBytes []byte
configBytes, err = getCNIConfigFromFile("", netname) configBytes, err = getCNIConfigFromFile("", netname)
if err == nil { if err == nil {
delegate, err := types.LoadDelegateNetConf(configBytes, "") delegate, err := types.LoadDelegateNetConf(configBytes, "", "")
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
types/conf.go
View File

@ -210,7 +210,7 @@ func LoadNetConf(bytes []byte) (*NetConf, error) {
if err != nil { if err != nil {
return nil, logging.Errorf("error marshalling delegate %d config: %v", idx, err) return nil, logging.Errorf("error marshalling delegate %d config: %v", idx, err)
} }
delegateConf, err := LoadDelegateNetConf(bytes, "") delegateConf, err := LoadDelegateNetConf(bytes, "", "")
if err != nil { if err != nil {
return nil, logging.Errorf("failed to load delegate %d config: %v", idx, err) return nil, logging.Errorf("failed to load delegate %d config: %v", idx, err)
} }