Merge pull request kubernetes#129450 from carlory/kubeadm-exec-check

k8s-ci-robot · web-flow · commit fcc1e9002af9 · 2025-01-18T06:38:34.000-08:00
kubeadm: update preflight check
diff --git a/cmd/kubeadm/app/preflight/checks_linux.go b/cmd/kubeadm/app/preflight/checks_linux.go
@@ -82,8 +82,11 @@ func addExecChecks(checks []Checker, execer utilsexec.Interface, k8sVersion stri
 		}
 	}
 
-	checks = append(checks,
-		InPathCheck{executable: "mount", mandatory: true, exec: execer},
-		InPathCheck{executable: "nsenter", mandatory: true, exec: execer})
+	// kubelet requires losetup to be present in PATH for block volume support since 1.9.0.
+	// (ref: https://github.com/kubernetes/kubernetes/pull/51494)
+	checks = append(checks, InPathCheck{executable: "losetup", mandatory: true, exec: execer})
+
+	// kubelet requires mount to be present in PATH for in-tree volume plugins.
+	checks = append(checks, InPathCheck{executable: "mount", mandatory: true, exec: execer})
 	return checks
 }

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,11 @@ func addExecChecks(checks []Checker, execer utilsexec.Interface, k8sVersion stri`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- checks = append(checks,`
`86`		`- InPathCheck{executable: "mount", mandatory: true, exec: execer},`
`87`		`- InPathCheck{executable: "nsenter", mandatory: true, exec: execer})`
	`85`	`+ // kubelet requires losetup to be present in PATH for block volume support since 1.9.0.`
	`86`	`+ // (ref: https://github.com/kubernetes/kubernetes/pull/51494)`
	`87`	`+ checks = append(checks, InPathCheck{executable: "losetup", mandatory: true, exec: execer})`
	`88`	`+`
	`89`	`+ // kubelet requires mount to be present in PATH for in-tree volume plugins.`
	`90`	`+ checks = append(checks, InPathCheck{executable: "mount", mandatory: true, exec: execer})`
`88`	`91`	`return checks`
`89`	`92`	`}`