Merge pull request #326 from vvhuang-ll/fix/default-interface-detection

Fix: Enhance default interface detection logic
alibaba · Dec 11, 2024 · 0caffc7 · 0caffc7
2 parents bc19a8b + 80d4412
commit 0caffc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/skoop/netstack/link.go b/pkg/skoop/netstack/link.go
@@ -71,8 +71,8 @@ func LookupDefaultIfaceName(ifaces []Interface) string {
 		}
 	}
 
-	// find first interfaces matched enp[0-9]+s[0-9]+.*
-	regex := regexp.MustCompile("^enp[0-9]+s[0-9]+.*$")
+	// find first interfaces matched (enp[0-9]+s[0-9]+.*|eth[0-9]+|ens[0-9]+)$")
+	regex := regexp.MustCompile("^(enp[0-9]+s[0-9]+.*|eth[0-9]+|ens[0-9]+)$")
 	filtered := lo.Filter(ifaces, func(i Interface, _ int) bool {
 		return regex.MatchString(i.Name)
 	})

diff --git a/pkg/skoop/netstack/link_test.go b/pkg/skoop/netstack/link_test.go
@@ -24,6 +24,10 @@ func TestLookupDefaultIfaceName(t *testing.T) {
 			ifaces:   []string{"wg0", "ipvs0", "cni0", "aaenp1s1"},
 			expected: "",
 		},
+		{
+			ifaces:   []string{"ens160", "cali85f094c216c", "vxlan.calico", "calie92c3084733"},
+			expected: "ens160",
+		},
 	}
 
 	for _, c := range testcases {