Add IP rules, routes and interface configs to support bundle

pkg/support/dump_others.go

@@ -18,13 +18,17 @@
 package support
 
 import (
+	"bytes"
 	"fmt"
+	"net"
 	"path"
 	"path/filepath"
 	"strings"
 
 	"antrea.io/antrea/pkg/agent/util/iptables"
+	"antrea.io/antrea/pkg/agent/util/sysctl"
 	"antrea.io/antrea/pkg/util/logdir"
+	"k8s.io/klog/v2"
 )
 
 func (d *agentDumper) DumpLog(basedir string) error {
@@ -44,6 +48,9 @@ func (d *agentDumper) DumpHostNetworkInfo(basedir string) error {
 	if err := d.dumpIPToolInfo(basedir); err != nil {
 		return err
 	}
+	if err := d.dumpInterfaceConfigs(basedir); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -60,21 +67,61 @@ func (d *agentDumper) dumpIPTables(basedir string) error {
 }
 
 func (d *agentDumper) dumpIPToolInfo(basedir string) error {
-	dump := func(name string) error {
-		output, err := d.executor.Command("ip", name).CombinedOutput()
+	dump := func(args ...string) error {
+		output, err := d.executor.Command("ip", args...).CombinedOutput()
 		if err != nil {
-			return fmt.Errorf("error when dumping %s: %w", name, err)
+			return fmt.Errorf("error when dumping %s: %w", strings.Join(args, " "), err)
 		}
-		return writeFile(d.fs, filepath.Join(basedir, name), name, output)
+		return writeFile(d.fs, filepath.Join(basedir, args[0]), args[0], output)
+	}
+	commands := [][]string{
+		{"link"},
+		{"address"},
+		{"rule", "show"},
+		{"route", "show", "table", "all"},
 	}
-	for _, item := range []string{"route", "link", "address"} {
-		if err := dump(item); err != nil {
+	for _, cmd := range commands {
+		if err := dump(cmd...); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
+func (d *agentDumper) dumpInterfaceConfigs(basedir string) error {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return fmt.Errorf("error getting network interfaces: %w", err)
+	}
+	hostGateway := d.aq.GetNodeConfig().GatewayConfig.Name
+    isRelevantIface := func(ifaceName string) bool {
+        return ifaceName == hostGateway ||
+            ifaceName == "antrea-egress0" ||
+            ifaceName == "antrea-ingress0" ||
+            strings.HasPrefix(ifaceName, "antrea-ext.")
+    }
+
+	params := []string{"rp_filter", "arp_ignore", "arp_announce"}
+	var output bytes.Buffer
+	for _, iface := range interfaces {
+		if !isRelevantIface(iface.Name) {
+            continue
+        }
+        output.WriteString(iface.Name)
+        output.WriteString("\n")
+		for _, param := range params {
+			value, err := sysctl.GetSysctlNet(fmt.Sprintf("ipv4/conf/%s/%s", iface.Name, param))
+			if err != nil {
+				klog.ErrorS(err, "Failed to get sysctl value", "interface", iface.Name, "param", param)
+				continue
+			}
+			output.WriteString(fmt.Sprintf("%s=%d\n", param, value))
+		}
+		output.WriteString("\n")
+	}
+	return writeFile(d.fs, filepath.Join(basedir, "interface-config"), "interface-config", output.Bytes())
+}
+
 func (d *agentDumper) DumpMemberlist(basedir string) error {
 	output, err := d.executor.Command("antctl", "-oyaml", "get", "memberlist").CombinedOutput()
 	if err != nil && !strings.Contains(string(output), "memberlist is not enabled") {

pkg/support/dump_others_test.go

@@ -22,13 +22,17 @@ import (
 	"path/filepath"
 	"testing"
 
-	"antrea.io/antrea/pkg/util/logdir"
-
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
+
+	"antrea.io/antrea/pkg/agent/config"
+	aqtest "antrea.io/antrea/pkg/agent/querier/testing"
+	"antrea.io/antrea/pkg/util/logdir"
 )
 
+
 func TestDumpLog(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	logDir := logdir.GetLogDir()
@@ -49,3 +53,49 @@ func TestDumpLog(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, ok)
 }
+
+func TestDumpIPToolInfo(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	exe := new(testExec)
+
+	dumper := NewAgentDumper(fs, exe, nil, nil, nil, "7s", true, true)
+	err := dumper.(*agentDumper).dumpIPToolInfo(baseDir)
+	require.NoError(t, err)
+
+	ok, err := afero.Exists(fs, filepath.Join(baseDir, "link"))
+	require.NoError(t, err)
+	assert.True(t, ok)
+
+	ok, err = afero.Exists(fs, filepath.Join(baseDir, "address"))
+	require.NoError(t, err)
+	assert.True(t, ok)
+
+	ok, err = afero.Exists(fs, filepath.Join(baseDir, "rule"))
+	require.NoError(t, err)
+	assert.True(t, ok)
+
+	ok, err = afero.Exists(fs, filepath.Join(baseDir, "route"))
+	require.NoError(t, err)
+	assert.True(t, ok)
+}
+
+func TestDumpInterfaceConfigs(t *testing.T) {
+	ctrl := gomock.NewController(t)
+
+	fs := afero.NewMemMapFs()
+	q := aqtest.NewMockAgentQuerier(ctrl)
+	q.EXPECT().GetNodeConfig().Return(&config.NodeConfig{
+		GatewayConfig: &config.GatewayConfig{
+			Name: "antrea-gw0",
+		},
+	}).AnyTimes()
+
+	dumper := NewAgentDumper(fs, nil, nil, q, nil, "7s", true, true)
+	err := dumper.(*agentDumper).dumpInterfaceConfigs(baseDir)
+	require.NoError(t, err)
+
+	ok, err := afero.Exists(fs, filepath.Join(baseDir, "interface-config"))
+	require.NoError(t, err)
+	assert.True(t, ok)
+}
+