scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-30 17:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run defaulting on the scheduler startup

Browse Source
This commit is contained in:
Clayton Coleman
2016-09-30 17:39:47 -04:00
parent 3ee591d7ab
commit 957c0955aa
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kube-proxy/app/options/options.go
View File

@@ -50,8 +50,10 @@ type ProxyServerConfig struct {
} }
func NewProxyConfig() *ProxyServerConfig { func NewProxyConfig() *ProxyServerConfig {
versioned := &v1alpha1.KubeProxyConfiguration{}
api.Scheme.Default(versioned)
cfg := componentconfig.KubeProxyConfiguration{} cfg := componentconfig.KubeProxyConfiguration{}
api.Scheme.Convert(&v1alpha1.KubeProxyConfiguration{}, &cfg, nil) api.Scheme.Convert(versioned, &cfg, nil)
return &ProxyServerConfig{ return &ProxyServerConfig{
KubeProxyConfiguration: cfg, KubeProxyConfiguration: cfg,
ContentType: "application/vnd.kubernetes.protobuf", ContentType: "application/vnd.kubernetes.protobuf",

4
cmd/kubelet/app/options/options.go
View File

@@ -64,8 +64,10 @@ type KubeletServer struct {
// NewKubeletServer will create a new KubeletServer with default values. // NewKubeletServer will create a new KubeletServer with default values.
func NewKubeletServer() *KubeletServer { func NewKubeletServer() *KubeletServer {
versioned := &v1alpha1.KubeletConfiguration{}
api.Scheme.Default(versioned)
config := componentconfig.KubeletConfiguration{} config := componentconfig.KubeletConfiguration{}
api.Scheme.Convert(&v1alpha1.KubeletConfiguration{}, &config, nil) api.Scheme.Convert(versioned, &config, nil)
return &KubeletServer{ return &KubeletServer{
KubeConfig: flag.NewStringFlag("/var/lib/kubelet/kubeconfig"), KubeConfig: flag.NewStringFlag("/var/lib/kubelet/kubeconfig"),
RequireKubeConfig: false, // in 1.5, default to true RequireKubeConfig: false, // in 1.5, default to true

1
cmd/kubelet/app/server.go
View File

@@ -246,6 +246,7 @@ func initKubeletConfigSync(s *options.KubeletServer) (*componentconfig.KubeletCo
if err != nil { if err != nil {
return nil, err return nil, err
} }
api.Scheme.Default(&extKC)
kc := componentconfig.KubeletConfiguration{} kc := componentconfig.KubeletConfiguration{}
err = api.Scheme.Convert(&extKC, &kc, nil) err = api.Scheme.Convert(&extKC, &kc, nil)
if err != nil { if err != nil {

1
pkg/kubemark/hollow_kubelet.go
View File

@@ -103,6 +103,7 @@ func GetHollowKubeletConfig(
// Do the external -> internal conversion to make sure that defaults // Do the external -> internal conversion to make sure that defaults
// are set for fields not overridden in NewHollowKubelet. // are set for fields not overridden in NewHollowKubelet.
tmp := &v1alpha1.KubeletConfiguration{} tmp := &v1alpha1.KubeletConfiguration{}
api.Scheme.Default(tmp)
c := &componentconfig.KubeletConfiguration{} c := &componentconfig.KubeletConfiguration{}
api.Scheme.Convert(tmp, c, nil) api.Scheme.Convert(tmp, c, nil)

4
plugin/cmd/kube-scheduler/app/options/options.go
View File

@@ -42,8 +42,10 @@ type SchedulerServer struct {
// NewSchedulerServer creates a new SchedulerServer with default parameters // NewSchedulerServer creates a new SchedulerServer with default parameters
func NewSchedulerServer() *SchedulerServer { func NewSchedulerServer() *SchedulerServer {
versioned := &v1alpha1.KubeSchedulerConfiguration{}
api.Scheme.Default(versioned)
cfg := componentconfig.KubeSchedulerConfiguration{} cfg := componentconfig.KubeSchedulerConfiguration{}
api.Scheme.Convert(&v1alpha1.KubeSchedulerConfiguration{}, &cfg, nil) api.Scheme.Convert(versioned, &cfg, nil)
cfg.LeaderElection.LeaderElect = true cfg.LeaderElection.LeaderElect = true
s := SchedulerServer{ s := SchedulerServer{
KubeSchedulerConfiguration: cfg, KubeSchedulerConfiguration: cfg,

2
test/e2e_node/dynamic_kubelet_configuration_test.go
View File

@@ -142,6 +142,8 @@ func decodeConfigz(resp *http.Response) (*componentconfig.KubeletConfiguration,
return nil, err return nil, err
} }
api.Scheme.Default(&configz.ComponentConfig)
err = api.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) err = api.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil)
if err != nil { if err != nil {
return nil, err return nil, err