github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

rkt: Override the config using the response from rkt api service.

Browse Source
This commit is contained in:
Yifan Gu 2016-08-23 11:42:20 -07:00
parent ea805efa4f
commit d65a96a600
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/rkt/config.go
View File

@ -88,21 +88,21 @@ func (r *Runtime) getConfig(cfg *Config) (*Config, error) {
flags := resp.Info.GlobalFlags flags := resp.Info.GlobalFlags
if cfg.Dir == "" { if flags.Dir != "" {
cfg.Dir = flags.Dir cfg.Dir = flags.Dir
} }
if cfg.InsecureOptions == "" { if flags.LocalConfigDir != "" {
cfg.InsecureOptions = flags.InsecureFlags
}
if cfg.LocalConfigDir == "" {
cfg.LocalConfigDir = flags.LocalConfigDir cfg.LocalConfigDir = flags.LocalConfigDir
} }
if cfg.UserConfigDir == "" { if flags.UserConfigDir != "" {
cfg.UserConfigDir = flags.UserConfigDir cfg.UserConfigDir = flags.UserConfigDir
} }
if cfg.SystemConfigDir == "" { if flags.SystemConfigDir != "" {
cfg.SystemConfigDir = flags.SystemConfigDir cfg.SystemConfigDir = flags.SystemConfigDir
} }
if flags.InsecureFlags != "" {
cfg.InsecureOptions = fmt.Sprintf("%s,%s", cfg.InsecureOptions, flags.InsecureFlags)
}
return cfg, nil return cfg, nil
} }