github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-31 08:33:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1142 from s1061123/fix/1130

Browse Source 
fix multus config file generation to avoid self-delegation
This commit is contained in:
Doug Smith
2023-08-16 10:58:56 -04:00
committed by GitHub
parent 8d8aa80cd5 159f2610c0
commit c5a0002be4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/thin_entrypoint/main.go
View File

@@ -305,7 +305,17 @@ func (o *Options) createMultusConfig() (string, error) {
return "", fmt.Errorf("cannot find master CNI config in %q: %v", o.MultusAutoconfigDir, err) return "", fmt.Errorf("cannot find master CNI config in %q: %v", o.MultusAutoconfigDir, err)
} }
masterConfigPath := files[0] masterConfigPath := ""
for _, filename := range files {
if !strings.HasPrefix(filepath.Base(filename), "00-multus.conf") {
masterConfigPath = filename
break
}
}
if masterConfigPath == "" {
return "", fmt.Errorf("cannot find valid master CNI config in %q", o.MultusAutoconfigDir)
}
masterConfigBytes, err := os.ReadFile(masterConfigPath) masterConfigBytes, err := os.ReadFile(masterConfigPath)
if err != nil { if err != nil {
return "", fmt.Errorf("cannot read master CNI config file %q: %v", masterConfigPath, err) return "", fmt.Errorf("cannot read master CNI config file %q: %v", masterConfigPath, err)