diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index bb4aa2319b0..201e8913065 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -54,8 +54,6 @@ import ( ) 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" ipv6DefaultForwarding = "/proc/sys/net/ipv6/conf/default/forwarding" externalEtcdRequestTimeout = 10 * time.Second diff --git a/cmd/kubeadm/app/preflight/checks_linux.go b/cmd/kubeadm/app/preflight/checks_linux.go index 188526f801c..3d23bf7730e 100644 --- a/cmd/kubeadm/app/preflight/checks_linux.go +++ b/cmd/kubeadm/app/preflight/checks_linux.go @@ -50,19 +50,17 @@ func addOSValidator(validators []system.Validator, reporter *system.StreamReport return validators } -// addIPv6Checks adds IPv6 related bridgenf and forwarding checks +// addIPv6Checks adds IPv6 related checks func addIPv6Checks(checks []Checker) []Checker { checks = append(checks, - FileContentCheck{Path: bridgenf6, Content: []byte{'1'}}, FileContentCheck{Path: ipv6DefaultForwarding, Content: []byte{'1'}}, ) return checks } -// addIPv4Checks adds IPv4 related bridgenf and forwarding checks +// addIPv4Checks adds IPv4 related checks func addIPv4Checks(checks []Checker) []Checker { checks = append(checks, - FileContentCheck{Path: bridgenf, Content: []byte{'1'}}, FileContentCheck{Path: ipv4Forward, Content: []byte{'1'}}) return checks } diff --git a/cmd/kubeadm/app/preflight/checks_other.go b/cmd/kubeadm/app/preflight/checks_other.go index d1016b54ad7..62c6d9ba9dc 100644 --- a/cmd/kubeadm/app/preflight/checks_other.go +++ b/cmd/kubeadm/app/preflight/checks_other.go @@ -30,13 +30,13 @@ func addOSValidator(validators []system.Validator, _ *system.StreamReporter) []s return validators } -// addIPv6Checks adds IPv6 related bridgenf and forwarding checks +// addIPv6Checks adds IPv6 related checks // No-op for Darwin (MacOS), Windows. func addIPv6Checks(checks []Checker) []Checker { return checks } -// addIPv4Checks adds IPv4 related bridgenf and forwarding checks +// addIPv4Checks adds IPv4 related checks // No-op for Darwin (MacOS), Windows. func addIPv4Checks(checks []Checker) []Checker { return checks