Skip to content

K
k3s
Commit 0c567fe3 authored by dalanlan's avatar dalanlan
Browse files
Options

fix #25345

parent 38d5be4f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
cmd/kubelet/app/server.go
View file @ 0c567fe3
...@@ -371,10 +371,6 @@ func run(s *options.KubeletServer, kcfg *KubeletConfig) (err error) { ...@@ -371,10 +371,6 @@ func run(s *options.KubeletServer, kcfg *KubeletConfig) (err error) {
runtime.ReallyCrash = s.ReallyCrashForTesting runtime.ReallyCrash = s.ReallyCrashForTesting
rand.Seed(time.Now().UTC().UnixNano()) 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. // TODO(vmarmol): Do this through container config.
oomAdjuster := kcfg.OOMAdjuster oomAdjuster := kcfg.OOMAdjuster
if err := oomAdjuster.ApplyOOMScoreAdj(0, int(s.OOMScoreAdj)); err != nil { if err := oomAdjuster.ApplyOOMScoreAdj(0, int(s.OOMScoreAdj)); err != nil {
...@@ -659,6 +655,7 @@ func RunKubelet(kcfg *KubeletConfig) error { ...@@ -659,6 +655,7 @@ func RunKubelet(kcfg *KubeletConfig) error {
capabilities.Setup(kcfg.AllowPrivileged, privilegedSources, 0) capabilities.Setup(kcfg.AllowPrivileged, privilegedSources, 0)
credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory) credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory)
glog.V(2).Infof("Using root directory: %v", kcfg.RootDirectory)
builder := kcfg.Builder builder := kcfg.Builder
if builder == nil { if builder == nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment