github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123464 from SataQiu/remove-bridge-nf-call-iptables-check

Browse Source 
kubeadm: remove bridge-nf-call-iptables and bridge-nf-call-ip6tables preflight checks since not all the network implementations require this setting
This commit is contained in:
Kubernetes Prow Robot
2024-02-23 00:49:17 -08:00
committed by GitHub
parent 003f4c5de4 75238e592d
commit 1b07df8845
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/preflight/checks.go
View File

@@ -54,8 +54,6 @@ import (
) )
const ( const (
bridgenf = "/proc/sys/net/bridge/bridge-nf-call-iptables"
bridgenf6 = "/proc/sys/net/bridge/bridge-nf-call-ip6tables"
ipv4Forward = "/proc/sys/net/ipv4/ip_forward" ipv4Forward = "/proc/sys/net/ipv4/ip_forward"
ipv6DefaultForwarding = "/proc/sys/net/ipv6/conf/default/forwarding" ipv6DefaultForwarding = "/proc/sys/net/ipv6/conf/default/forwarding"
externalEtcdRequestTimeout = 10 * time.Second externalEtcdRequestTimeout = 10 * time.Second

6
cmd/kubeadm/app/preflight/checks_linux.go
View File

@@ -50,19 +50,17 @@ func addOSValidator(validators []system.Validator, reporter *system.StreamReport
return validators return validators
} }
// addIPv6Checks adds IPv6 related bridgenf and forwarding checks // addIPv6Checks adds IPv6 related checks
func addIPv6Checks(checks []Checker) []Checker { func addIPv6Checks(checks []Checker) []Checker {
checks = append(checks, checks = append(checks,
FileContentCheck{Path: bridgenf6, Content: []byte{'1'}},
FileContentCheck{Path: ipv6DefaultForwarding, Content: []byte{'1'}}, FileContentCheck{Path: ipv6DefaultForwarding, Content: []byte{'1'}},
) )
return checks return checks
} }
// addIPv4Checks adds IPv4 related bridgenf and forwarding checks // addIPv4Checks adds IPv4 related checks
func addIPv4Checks(checks []Checker) []Checker { func addIPv4Checks(checks []Checker) []Checker {
checks = append(checks, checks = append(checks,
FileContentCheck{Path: bridgenf, Content: []byte{'1'}},
FileContentCheck{Path: ipv4Forward, Content: []byte{'1'}}) FileContentCheck{Path: ipv4Forward, Content: []byte{'1'}})
return checks return checks
} }

4
cmd/kubeadm/app/preflight/checks_other.go
View File

@@ -30,13 +30,13 @@ func addOSValidator(validators []system.Validator, _ *system.StreamReporter) []s
return validators return validators
} }
// addIPv6Checks adds IPv6 related bridgenf and forwarding checks // addIPv6Checks adds IPv6 related checks
// No-op for Darwin (MacOS), Windows. // No-op for Darwin (MacOS), Windows.
func addIPv6Checks(checks []Checker) []Checker { func addIPv6Checks(checks []Checker) []Checker {
return checks return checks
} }
// addIPv4Checks adds IPv4 related bridgenf and forwarding checks // addIPv4Checks adds IPv4 related checks
// No-op for Darwin (MacOS), Windows. // No-op for Darwin (MacOS), Windows.
func addIPv4Checks(checks []Checker) []Checker { func addIPv4Checks(checks []Checker) []Checker {
return checks return checks