From 1b2685dc906e1095d6c4ddc7df39e61b77715626 Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Wed, 7 Nov 2018 17:09:54 +0900 Subject: [PATCH] Fix rebase conflicts. --- k8sclient/k8sclient.go | 6 +++--- types/conf.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8sclient/k8sclient.go b/k8sclient/k8sclient.go index 6368aa499..1bbfe9516 100644 --- a/k8sclient/k8sclient.go +++ b/k8sclient/k8sclient.go @@ -536,7 +536,7 @@ func getDefaultNetDelegateCRD(client KubeClient, net string, confdir string) (*t return nil, err } - delegate, err := types.LoadDelegateNetConf(configBytes, "", "") + delegate, err := types.LoadDelegateNetConf(configBytes, nil, "") if err != nil { return nil, err } @@ -556,7 +556,7 @@ func getNetDelegate(client KubeClient, netname string, confdir string) (*types.D var configBytes []byte configBytes, err = getCNIConfigFromFile(netname, confdir) if err == nil { - delegate, err := types.LoadDelegateNetConf(configBytes, "", "") + delegate, err := types.LoadDelegateNetConf(configBytes, nil, "") if err != nil { return nil, err } @@ -572,7 +572,7 @@ func getNetDelegate(client KubeClient, netname string, confdir string) (*types.D var configBytes []byte configBytes, err = getCNIConfigFromFile("", netname) if err == nil { - delegate, err := types.LoadDelegateNetConf(configBytes, "", "") + delegate, err := types.LoadDelegateNetConf(configBytes, nil, "") if err != nil { return nil, err } diff --git a/types/conf.go b/types/conf.go index 075b617a4..0010d3476 100644 --- a/types/conf.go +++ b/types/conf.go @@ -223,7 +223,7 @@ func LoadNetConf(bytes []byte) (*NetConf, error) { if err != nil { return nil, logging.Errorf("error marshalling delegate %d config: %v", idx, err) } - delegateConf, err := LoadDelegateNetConf(bytes, "", "") + delegateConf, err := LoadDelegateNetConf(bytes, nil, "") if err != nil { return nil, logging.Errorf("failed to load delegate %d config: %v", idx, err) }