github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-10-22 07:52:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix rebase conflicts.

Browse Source
This commit is contained in:
Tomofumi Hayashi
2018-11-07 17:09:54 +09:00
committed by dougbtv
parent 818c8d7c99
commit bcc6e21587
2 changed files with 4 additions and 4 deletions
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, nil, "")
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, nil, "")
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, nil, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
types/conf.go
View File

@@ -217,7 +217,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, nil, "")
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)
} }