github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Update iptables.IsNotFoundError for iptables-nft error messages

Browse Source
This commit is contained in:
Dan Winship 2019-05-01 10:11:32 -04:00
parent ebe32557bc
commit 4d77d3e75f
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/util/iptables/iptables.go
View File

@ -696,16 +696,39 @@ func (runner *runner) reload() {
} }
} }
var iptablesNotFoundStrings = []string{
// iptables-legacy [-A|-I] BAD-CHAIN [...]
// iptables-legacy [-C|-D] GOOD-CHAIN [...non-matching rule...]
// iptables-legacy [-X|-F|-Z] BAD-CHAIN
// iptables-nft -X BAD-CHAIN
// NB: iptables-nft [-F|-Z] BAD-CHAIN exits with no error
"No chain/target/match by that name",
// iptables-legacy [...] -j BAD-CHAIN
// iptables-nft-1.8.0 [-A|-I] BAD-CHAIN [...]
// iptables-nft-1.8.0 [-A|-I] GOOD-CHAIN -j BAD-CHAIN
// NB: also matches some other things like "-m BAD-MODULE"
"No such file or directory",
// iptables-legacy [-C|-D] BAD-CHAIN [...]
// iptables-nft [-C|-D] GOOD-CHAIN [...non-matching rule...]
"does a matching rule exist",
// iptables-nft-1.8.2 [-A|-C|-D|-I] BAD-CHAIN [...]
// iptables-nft-1.8.2 [...] -j BAD-CHAIN
"does not exist",
}
// IsNotFoundError returns true if the error indicates "not found". It parses // IsNotFoundError returns true if the error indicates "not found". It parses
// the error string looking for known values, which is imperfect but works in // the error string looking for known values, which is imperfect; beware using
// practice. // this function for anything beyond deciding between logging or ignoring an
// error.
func IsNotFoundError(err error) bool { func IsNotFoundError(err error) bool {
es := err.Error() es := err.Error()
if strings.Contains(es, "No such file or directory") { for _, str := range iptablesNotFoundStrings {
return true if strings.Contains(es, str) {
} return true
if strings.Contains(es, "No chain/target/match by that name") { }
return true
} }
return false return false
} }