From fe03e1319f6d279f6b9ac60c8ca34fe907eb94e3 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Wed, 2 Nov 2016 16:03:37 -0300 Subject: [PATCH] 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. --- cmd/kubeadm/app/preflight/checks.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index e09f0d8cb5a..1b0950745ff 100644 --- 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},