From fe768dd405691ea2052c0607b447d35ccce4b71e Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Mon, 5 Sep 2016 19:50:44 +0100 Subject: [PATCH] Do not go into standalone mode when `--require-kubeconfig` is passed (fix #32085) --- cmd/kubelet/app/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index fa3f5cc755..f38d09204b 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -298,7 +298,7 @@ func initConfigz(kc *componentconfig.KubeletConfiguration) (*configz.Config, err func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { // TODO: this should be replaced by a --standalone flag - standaloneMode := (len(s.APIServerList) == 0) + standaloneMode := (len(s.APIServerList) == 0 && !s.RequireKubeConfig) if s.ExitOnLockContention && s.LockFilePath == "" { return errors.New("cannot exit on lock file contention: no lock file specified")