Merge pull request #1142 from s1061123/fix/1130

fix multus config file generation to avoid self-delegation
k8snetworkplumbingwg · Aug 16, 2023 · c5a0002 · c5a0002
2 parents 8d8aa80 + 159f261
commit c5a0002
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cmd/thin_entrypoint/main.go b/cmd/thin_entrypoint/main.go
@@ -305,7 +305,17 @@ func (o *Options) createMultusConfig() (string, error) {
 		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)
 	if err != nil {
 		return "", fmt.Errorf("cannot read master CNI config file %q: %v", masterConfigPath, err)