mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 02:08:13 +00:00 
			
		
		
		
	Run defaulting on the scheduler startup
This commit is contained in:
		| @@ -50,8 +50,10 @@ type ProxyServerConfig struct { | ||||
| } | ||||
|  | ||||
| func NewProxyConfig() *ProxyServerConfig { | ||||
| 	versioned := &v1alpha1.KubeProxyConfiguration{} | ||||
| 	api.Scheme.Default(versioned) | ||||
| 	cfg := componentconfig.KubeProxyConfiguration{} | ||||
| 	api.Scheme.Convert(&v1alpha1.KubeProxyConfiguration{}, &cfg, nil) | ||||
| 	api.Scheme.Convert(versioned, &cfg, nil) | ||||
| 	return &ProxyServerConfig{ | ||||
| 		KubeProxyConfiguration: cfg, | ||||
| 		ContentType:            "application/vnd.kubernetes.protobuf", | ||||
|   | ||||
| @@ -64,8 +64,10 @@ type KubeletServer struct { | ||||
|  | ||||
| // NewKubeletServer will create a new KubeletServer with default values. | ||||
| func NewKubeletServer() *KubeletServer { | ||||
| 	versioned := &v1alpha1.KubeletConfiguration{} | ||||
| 	api.Scheme.Default(versioned) | ||||
| 	config := componentconfig.KubeletConfiguration{} | ||||
| 	api.Scheme.Convert(&v1alpha1.KubeletConfiguration{}, &config, nil) | ||||
| 	api.Scheme.Convert(versioned, &config, nil) | ||||
| 	return &KubeletServer{ | ||||
| 		KubeConfig:           flag.NewStringFlag("/var/lib/kubelet/kubeconfig"), | ||||
| 		RequireKubeConfig:    false, // in 1.5, default to true | ||||
|   | ||||
| @@ -246,6 +246,7 @@ func initKubeletConfigSync(s *options.KubeletServer) (*componentconfig.KubeletCo | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
| 		api.Scheme.Default(&extKC) | ||||
| 		kc := componentconfig.KubeletConfiguration{} | ||||
| 		err = api.Scheme.Convert(&extKC, &kc, nil) | ||||
| 		if err != nil { | ||||
|   | ||||
| @@ -103,6 +103,7 @@ func GetHollowKubeletConfig( | ||||
| 	// Do the external -> internal conversion to make sure that defaults | ||||
| 	// are set for fields not overridden in NewHollowKubelet. | ||||
| 	tmp := &v1alpha1.KubeletConfiguration{} | ||||
| 	api.Scheme.Default(tmp) | ||||
| 	c := &componentconfig.KubeletConfiguration{} | ||||
| 	api.Scheme.Convert(tmp, c, nil) | ||||
|  | ||||
|   | ||||
| @@ -42,8 +42,10 @@ type SchedulerServer struct { | ||||
|  | ||||
| // NewSchedulerServer creates a new SchedulerServer with default parameters | ||||
| func NewSchedulerServer() *SchedulerServer { | ||||
| 	versioned := &v1alpha1.KubeSchedulerConfiguration{} | ||||
| 	api.Scheme.Default(versioned) | ||||
| 	cfg := componentconfig.KubeSchedulerConfiguration{} | ||||
| 	api.Scheme.Convert(&v1alpha1.KubeSchedulerConfiguration{}, &cfg, nil) | ||||
| 	api.Scheme.Convert(versioned, &cfg, nil) | ||||
| 	cfg.LeaderElection.LeaderElect = true | ||||
| 	s := SchedulerServer{ | ||||
| 		KubeSchedulerConfiguration: cfg, | ||||
|   | ||||
| @@ -142,6 +142,8 @@ func decodeConfigz(resp *http.Response) (*componentconfig.KubeletConfiguration, | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	api.Scheme.Default(&configz.ComponentConfig) | ||||
|  | ||||
| 	err = api.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Clayton Coleman
					Clayton Coleman