Fix rebase conflicts.

k8snetworkplumbingwg · Nov 7, 2018 · 1b2685d · 1b2685d
1 parent 60a046b
commit 1b2685d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)
 			}