mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #108452 from HirazawaUi/master
show error details removing or adding ipset entry
This commit is contained in:
commit
cbf4186a57
@ -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
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user