github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cni: clarify bin/conf directory variable names

Browse Source 
pluginDir -> confDir
DefaultNetDir -> DefaultConfDir
DefaultCNIDir -> DefaultBinDir
This commit is contained in:
Dan Williams 2018-01-23 11:45:20 -06:00
parent 6608a47c84
commit 16eaaaed83
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/kubelet/network/cni/cni.go
View File

@ -34,8 +34,8 @@ import (
const ( const (
CNIPluginName = "cni" CNIPluginName = "cni"
DefaultNetDir = "/etc/cni/net.d" DefaultConfDir = "/etc/cni/net.d"
DefaultCNIDir = "/opt/cni/bin" DefaultBinDir = "/opt/cni/bin"
VendorCNIDirTemplate = "%s/opt/%s/bin" VendorCNIDirTemplate = "%s/opt/%s/bin"
) )
@ -50,7 +50,7 @@ type cniNetworkPlugin struct {
host network.Host host network.Host
execer utilexec.Interface execer utilexec.Interface
nsenterPath string nsenterPath string
pluginDir string confDir string
binDir string binDir string
vendorCNIDirPrefix string vendorCNIDirPrefix string
} }
@ -70,15 +70,15 @@ type cniPortMapping struct {
HostIP string `json:"hostIP"` HostIP string `json:"hostIP"`
} }
func probeNetworkPluginsWithVendorCNIDirPrefix(pluginDir, binDir, vendorCNIDirPrefix string) []network.NetworkPlugin { func probeNetworkPluginsWithVendorCNIDirPrefix(confDir, binDir, vendorCNIDirPrefix string) []network.NetworkPlugin {
if binDir == "" { if binDir == "" {
binDir = DefaultCNIDir binDir = DefaultBinDir
} }
plugin := &cniNetworkPlugin{ plugin := &cniNetworkPlugin{
defaultNetwork: nil, defaultNetwork: nil,
loNetwork: getLoNetwork(binDir, vendorCNIDirPrefix), loNetwork: getLoNetwork(binDir, vendorCNIDirPrefix),
execer: utilexec.New(), execer: utilexec.New(),
pluginDir: pluginDir, confDir: confDir,
binDir: binDir, binDir: binDir,
vendorCNIDirPrefix: vendorCNIDirPrefix, vendorCNIDirPrefix: vendorCNIDirPrefix,
} }
@ -88,20 +88,20 @@ func probeNetworkPluginsWithVendorCNIDirPrefix(pluginDir, binDir, vendorCNIDirPr
return []network.NetworkPlugin{plugin} return []network.NetworkPlugin{plugin}
} }
func ProbeNetworkPlugins(pluginDir, binDir string) []network.NetworkPlugin { func ProbeNetworkPlugins(confDir, binDir string) []network.NetworkPlugin {
return probeNetworkPluginsWithVendorCNIDirPrefix(pluginDir, binDir, "") return probeNetworkPluginsWithVendorCNIDirPrefix(confDir, binDir, "")
} }
func getDefaultCNINetwork(pluginDir, binDir, vendorCNIDirPrefix string) (*cniNetwork, error) { func getDefaultCNINetwork(confDir, binDir, vendorCNIDirPrefix string) (*cniNetwork, error) {
if pluginDir == "" { if confDir == "" {
pluginDir = DefaultNetDir confDir = DefaultConfDir
} }
files, err := libcni.ConfFiles(pluginDir, []string{".conf", ".conflist", ".json"}) files, err := libcni.ConfFiles(confDir, []string{".conf", ".conflist", ".json"})
switch { switch {
case err != nil: case err != nil:
return nil, err return nil, err
case len(files) == 0: case len(files) == 0:
return nil, fmt.Errorf("No networks found in %s", pluginDir) return nil, fmt.Errorf("No networks found in %s", confDir)
} }
sort.Strings(files) sort.Strings(files)
@ -146,7 +146,7 @@ func getDefaultCNINetwork(pluginDir, binDir, vendorCNIDirPrefix string) (*cniNet
network := &cniNetwork{name: confList.Name, NetworkConfig: confList, CNIConfig: cninet} network := &cniNetwork{name: confList.Name, NetworkConfig: confList, CNIConfig: cninet}
return network, nil return network, nil
} }
return nil, fmt.Errorf("No valid networks found in %s", pluginDir) return nil, fmt.Errorf("No valid networks found in %s", confDir)
} }
func vendorCNIDir(prefix, pluginType string) string { func vendorCNIDir(prefix, pluginType string) string {
@ -166,7 +166,7 @@ func (plugin *cniNetworkPlugin) Init(host network.Host, hairpinMode kubeletconfi
} }
func (plugin *cniNetworkPlugin) syncNetworkConfig() { func (plugin *cniNetworkPlugin) syncNetworkConfig() {
network, err := getDefaultCNINetwork(plugin.pluginDir, plugin.binDir, plugin.vendorCNIDirPrefix) network, err := getDefaultCNINetwork(plugin.confDir, plugin.binDir, plugin.vendorCNIDirPrefix)
if err != nil { if err != nil {
glog.Warningf("Unable to update cni config: %s", err) glog.Warningf("Unable to update cni config: %s", err)
return return
@ -198,7 +198,7 @@ func (plugin *cniNetworkPlugin) Name() string {
} }
func (plugin *cniNetworkPlugin) Status() error { func (plugin *cniNetworkPlugin) Status() error {
// sync network config from pluginDir periodically to detect network config updates // sync network config from confDir periodically to detect network config updates
plugin.syncNetworkConfig() plugin.syncNetworkConfig()
// Can't set up pods if we don't have any CNI network configs yet // Can't set up pods if we don't have any CNI network configs yet