github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108452 from HirazawaUi/master

Browse Source 
show error details removing or adding ipset entry
This commit is contained in:
Kubernetes Prow Robot 2022-03-20 16:31:12 -07:00 committed by GitHub
commit cbf4186a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/util/ipset/ipset.go
View File

@ -313,16 +313,16 @@ func (runner *runner) AddEntry(entry string, set *IPSet, ignoreExistErr bool) er
if ignoreExistErr { if ignoreExistErr {
args = append(args, "-exist") args = append(args, "-exist")
} }
if _, err := runner.exec.Command(IPSetCmd, args...).CombinedOutput(); err != nil { if out, err := runner.exec.Command(IPSetCmd, args...).CombinedOutput(); err != nil {
return fmt.Errorf("error adding entry %s, error: %v", entry, err) return fmt.Errorf("error adding entry %s, error: %v (%s)", entry, err, out)
} }
return nil return nil
} }
// DelEntry is used to delete the specified entry from the set. // DelEntry is used to delete the specified entry from the set.
func (runner *runner) DelEntry(entry string, set string) error { func (runner *runner) DelEntry(entry string, set string) error {
if _, err := runner.exec.Command(IPSetCmd, "del", set, entry).CombinedOutput(); err != nil { if out, err := runner.exec.Command(IPSetCmd, "del", set, entry).CombinedOutput(); err != nil {
return fmt.Errorf("error deleting entry %s: from set: %s, error: %v", entry, set, err) return fmt.Errorf("error deleting entry %s: from set: %s, error: %v (%s)", entry, set, err, out)
} }
return nil return nil
} }