From 6b0266148bc3c828df75f151d43f485ca05e1776 Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Thu, 11 Oct 2018 17:57:20 +0900 Subject: [PATCH] Add clusterNetwork/defaultNetwork into multus To support CRD/file/directory, add clusterNetwork/defaultNetwork in multus.conf file. --- 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 09ef4bded..58691f5d6 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, "", "") 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, "", "") 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, "", "") if err != nil { return nil, err } diff --git a/types/conf.go b/types/conf.go index 2c2095356..4f4d9295d 100644 --- a/types/conf.go +++ b/types/conf.go @@ -210,7 +210,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, "", "") if err != nil { return nil, logging.Errorf("failed to load delegate %d config: %v", idx, err) }