Merge pull request kubernetes#129131 from pacoxu/kubeadm-iptables-check

k8s-ci-robot · web-flow · commit e81857488529 · 2024-12-14T08:14:53.000+01:00
kubeadm: remove iptables/ip/tc/ethtool binary preflight check
diff --git a/cmd/kubeadm/app/preflight/checks_linux.go b/cmd/kubeadm/app/preflight/checks_linux.go
@@ -83,12 +83,8 @@ func addExecChecks(checks []Checker, execer utilsexec.Interface, k8sVersion stri
 	}
 
 	checks = append(checks,
-		InPathCheck{executable: "ip", mandatory: true, exec: execer},
-		InPathCheck{executable: "iptables", mandatory: true, exec: execer},
 		InPathCheck{executable: "mount", mandatory: true, exec: execer},
 		InPathCheck{executable: "nsenter", mandatory: true, exec: execer},
-		InPathCheck{executable: "ethtool", mandatory: false, exec: execer},
-		InPathCheck{executable: "tc", mandatory: false, exec: execer},
 		InPathCheck{executable: "touch", mandatory: false, exec: execer})
 	return checks
 }

Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,8 @@ func addExecChecks(checks []Checker, execer utilsexec.Interface, k8sVersion stri`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`checks = append(checks,`
`86`		`- InPathCheck{executable: "ip", mandatory: true, exec: execer},`
`87`		`- InPathCheck{executable: "iptables", mandatory: true, exec: execer},`
`88`	`86`	`InPathCheck{executable: "mount", mandatory: true, exec: execer},`
`89`	`87`	`InPathCheck{executable: "nsenter", mandatory: true, exec: execer},`
`90`		`- InPathCheck{executable: "ethtool", mandatory: false, exec: execer},`
`91`		`- InPathCheck{executable: "tc", mandatory: false, exec: execer},`
`92`	`88`	`InPathCheck{executable: "touch", mandatory: false, exec: execer})`
`93`	`89`	`return checks`
`94`	`90`	`}`