Merge pull request #36083 from dgoodwin/join-etc-kubernetes

Automatic merge from submit-queue kubeadm: Fix preflight check failure on node join. We recently improved this to tolerate existence of things like /etc/kubernetes/manifests/ as an empty dir, but forgot to do so for the join pre-flight checks where it is also failing. Instead ensure only the sub-directories and files we need are available. CC @luxas @kubernetes/sig-cluster-lifecycle

Merge pull request #36083 from dgoodwin/join-etc-kubernetes
7747f5ee · Kubernetes Submit Queue · GitHub · 9a7ad2e2 · fe03e131 · 7747f5ee
Commit 7747f5ee authored Nov 02, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 02, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

checks.go cmd/kubeadm/app/preflight/checks.go +2 -1

No files found.
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -258,8 +258,9 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error {
 		PortOpenCheck{port: 10250},
 		HttpProxyCheck{Proto: "https", Host: cfg.MasterAddresses[0], Port: int(cfg.APIPort)},
 		HttpProxyCheck{Proto: "http", Host: cfg.MasterAddresses[0], Port: int(cfg.DiscoveryPort)},
-		DirAvailableCheck{Path: "/etc/kubernetes"},
+		DirAvailableCheck{Path: "/etc/kubernetes/manifests"},
 		DirAvailableCheck{Path: "/var/lib/kubelet"},
+		FileAvailableCheck{Path: "/etc/kubernetes/kubelet.conf"},
 		InPathCheck{executable: "ebtables", mandatory: true},
 		InPathCheck{executable: "ethtool", mandatory: true},
 		InPathCheck{executable: "ip", mandatory: true},