Merge pull request #26611 from ZJU-SEL/clean-up-dup

Automatic merge from submit-queue clean up dup code for kubelet `RunKubelet` is called elsewhere, hence we should keep it that way. Fixes #25345

Merge pull request #26611 from ZJU-SEL/clean-up-dup
715d2f23 · k8s-merge-robot · GitHub · b8082067 · 0c567fe3 · 715d2f23
Commit 715d2f23 authored Jul 07, 2016 by k8s-merge-robot Committed by GitHub Jul 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

server.go cmd/kubelet/app/server.go +1 -4

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -377,10 +377,6 @@ func run(s *options.KubeletServer, kcfg *KubeletConfig) (err error) {
 	runtime.ReallyCrash = s.ReallyCrashForTesting
 	rand.Seed(time.Now().UTC().UnixNano())

-	credentialprovider.SetPreferredDockercfgPath(s.RootDirectory)
-
-	glog.V(2).Infof("Using root directory: %v", s.RootDirectory)
-
 	// TODO(vmarmol): Do this through container config.
 	oomAdjuster := kcfg.OOMAdjuster
 	if err := oomAdjuster.ApplyOOMScoreAdj(0, int(s.OOMScoreAdj)); err != nil {
@@ -668,6 +664,7 @@ func RunKubelet(kcfg *KubeletConfig) error {
 	capabilities.Setup(kcfg.AllowPrivileged, privilegedSources, 0)

 	credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory)
+	glog.V(2).Infof("Using root directory: %v", kcfg.RootDirectory)

 	builder := kcfg.Builder
 	if builder == nil {