Skip to content

feat: add ipsets to supportbundle #7552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add ipsets to supportbundle #7552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/agent/util/ipset/ipset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ type Interface interface {
DelEntry(name string, entry string) error

ListEntries(name string) ([]string, error)

Save() ([]byte, error)
}

type Client struct {
Expand Down Expand Up @@ -121,3 +123,12 @@ func (c *Client) ListEntries(name string) ([]string, error) {
}
return entries, nil
}

func (c *Client) Save() ([]byte, error) {
cmd := c.exec.Command("ipset", "save")
output, err := cmd.CombinedOutput()
if err != nil {
return nil, fmt.Errorf("error saving ipset: %w, output: %s", err, string(output))
}
return output, nil
}
13 changes: 13 additions & 0 deletions pkg/support/dump_others.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"path/filepath"
"strings"

"antrea.io/antrea/pkg/agent/util/ipset"
"antrea.io/antrea/pkg/agent/util/iptables"
"antrea.io/antrea/pkg/util/logdir"
)
Expand All @@ -41,6 +42,9 @@ func (d *agentDumper) DumpHostNetworkInfo(basedir string) error {
if err := d.dumpIPTables(basedir); err != nil {
return err
}
if err := d.dumpIPSets(basedir); err != nil {
return err
}
if err := d.dumpIPToolInfo(basedir); err != nil {
return err
}
Expand All @@ -59,6 +63,15 @@ func (d *agentDumper) dumpIPTables(basedir string) error {
return writeFile(d.fs, filepath.Join(basedir, "iptables"), "iptables", data)
}

func (d *agentDumper) dumpIPSets(basedir string) error {
c := ipset.NewClient()
data, err := c.Save()
if err != nil {
return err
}
return writeFile(d.fs, filepath.Join(basedir, "ipsets"), "ipsets", data)
}

func (d *agentDumper) dumpIPToolInfo(basedir string) error {
dump := func(name string) error {
output, err := d.executor.Command("ip", name).CombinedOutput()
Expand Down