github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-17 15:07:14 +00:00
Code Issues Projects Releases Wiki Activity

server/config: use filepath.Join()

Browse Source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams
2023-09-13 08:51:40 -05:00
parent fb4f4aa4c1
commit b0df7dd5e3
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/config/manager.go
View File

@@ -91,7 +91,7 @@ func overrideCNIVersion(cniConfigFile string, multusCNIVersion string) error {
func newManager(config MultusConf, defaultCNIPluginName string) (*Manager, error) { func newManager(config MultusConf, defaultCNIPluginName string) (*Manager, error) {
if config.ForceCNIVersion { if config.ForceCNIVersion {
err := overrideCNIVersion(cniPluginConfigFilePath(config.MultusAutoconfigDir, defaultCNIPluginName), config.CNIVersion) err := overrideCNIVersion(filepath.Join(config.MultusAutoconfigDir, defaultCNIPluginName), config.CNIVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -115,8 +115,8 @@ func newManager(config MultusConf, defaultCNIPluginName string) (*Manager, error
configWatcher: watcher, configWatcher: watcher,
multusConfig: &config, multusConfig: &config,
multusConfigDir: config.MultusAutoconfigDir, multusConfigDir: config.MultusAutoconfigDir,
multusConfigFilePath: cniPluginConfigFilePath(config.CniConfigDir, multusConfigFileName), multusConfigFilePath: filepath.Join(config.CniConfigDir, multusConfigFileName),
primaryCNIConfigPath: cniPluginConfigFilePath(config.MultusAutoconfigDir, defaultCNIPluginName), primaryCNIConfigPath: filepath.Join(config.MultusAutoconfigDir, defaultCNIPluginName),
readinessIndicatorFilePath: config.ReadinessIndicatorFile, readinessIndicatorFilePath: config.ReadinessIndicatorFile,
} }
@@ -289,10 +289,6 @@ func getPrimaryCNIPluginName(multusAutoconfigDir string) (string, error) {
return masterCniConfigFileName, nil return masterCniConfigFileName, nil
} }
func cniPluginConfigFilePath(cniConfigDir string, cniConfigFileName string) string {
return cniConfigDir + fmt.Sprintf("/%s", cniConfigFileName)
}
func newWatcher(cniConfigDir string, readinessIndicatorDir string) (*fsnotify.Watcher, error) { func newWatcher(cniConfigDir string, readinessIndicatorDir string) (*fsnotify.Watcher, error) {
watcher, err := fsnotify.NewWatcher() watcher, err := fsnotify.NewWatcher()
if err != nil { if err != nil {