From 6b2df1cf01a559c588b1782740154fe7ff47c47b Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Tue, 2 May 2017 08:24:58 -0700 Subject: [PATCH] kubeadm: move preflight kubelet check --- cmd/kubeadm/app/cmd/init.go | 6 +++--- cmd/kubeadm/app/cmd/join.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index b119eb54ad..0c455e67d2 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -175,13 +175,13 @@ func NewInit(cfgPath string, cfg *kubeadmapi.MasterConfiguration, skipPreFlight, if err := preflight.RunInitMasterChecks(cfg); err != nil { return nil, err } + + // Try to start the kubelet service in case it's inactive + preflight.TryStartKubelet() } else { fmt.Println("[preflight] Skipping pre-flight checks") } - // Try to start the kubelet service in case it's inactive - preflight.TryStartKubelet() - return &Init{cfg: cfg, skipTokenPrint: skipTokenPrint}, nil } diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index 13c1e5836b..031b89c15e 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -156,13 +156,13 @@ func NewJoin(cfgPath string, args []string, cfg *kubeadmapi.NodeConfiguration, s if err := preflight.RunJoinNodeChecks(cfg); err != nil { return nil, err } + + // Try to start the kubelet service in case it's inactive + preflight.TryStartKubelet() } else { fmt.Println("[preflight] Skipping pre-flight checks") } - // Try to start the kubelet service in case it's inactive - preflight.TryStartKubelet() - return &Join{cfg: cfg}, nil }