Merge pull request #20539 from mikedanese/kube-scheduler-external

Auto commit by PR queue bot

pkg/apis/componentconfig/register.go

@@ -45,7 +45,9 @@ func addKnownTypes(scheme *runtime.Scheme) {
 	// TODO this will get cleaned up with the scheme types are fixed
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&KubeProxyConfiguration{},
+		&KubeSchedulerConfiguration{},
 	)
 }
 
-func (obj *KubeProxyConfiguration) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }
+func (obj *KubeProxyConfiguration) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }
+func (obj *KubeSchedulerConfiguration) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }

pkg/apis/componentconfig/types.go

@@ -291,6 +291,8 @@ type KubeletConfiguration struct {
 }
 
 type KubeSchedulerConfiguration struct {
+	unversioned.TypeMeta
+
 	// port is the port that the scheduler's http service runs on.
 	Port int `json:"port"`
 	// address is the IP address to serve on.

pkg/apis/componentconfig/v1alpha1/conversion_generated.go

@@ -66,6 +66,56 @@ func Convert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfigu
 	return autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration(in, out, s)
 }
 
+func autoConvert_componentconfig_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration(in *componentconfig.KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*componentconfig.KubeSchedulerConfiguration))(in)
+	}
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	out.Port = in.Port
+	out.Address = in.Address
+	out.AlgorithmProvider = in.AlgorithmProvider
+	out.PolicyConfigFile = in.PolicyConfigFile
+	if err := api.Convert_bool_To_bool_ref(&in.EnableProfiling, &out.EnableProfiling, s); err != nil {
+		return err
+	}
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.SchedulerName = in.SchedulerName
+	if err := Convert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Convert_componentconfig_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration(in *componentconfig.KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, s conversion.Scope) error {
+	return autoConvert_componentconfig_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration(in, out, s)
+}
+
+func autoConvert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(in *componentconfig.LeaderElectionConfiguration, out *LeaderElectionConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*componentconfig.LeaderElectionConfiguration))(in)
+	}
+	if err := api.Convert_bool_To_bool_ref(&in.LeaderElect, &out.LeaderElect, s); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.LeaseDuration, &out.LeaseDuration, 0); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.RenewDeadline, &out.RenewDeadline, 0); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.RetryPeriod, &out.RetryPeriod, 0); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Convert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(in *componentconfig.LeaderElectionConfiguration, out *LeaderElectionConfiguration, s conversion.Scope) error {
+	return autoConvert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(in, out, s)
+}
+
 func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in *KubeProxyConfiguration, out *componentconfig.KubeProxyConfiguration, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*KubeProxyConfiguration))(in)
@@ -106,10 +156,64 @@ func Convert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfigu
 	return autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in, out, s)
 }
 
+func autoConvert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration(in *KubeSchedulerConfiguration, out *componentconfig.KubeSchedulerConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*KubeSchedulerConfiguration))(in)
+	}
+	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
+		return err
+	}
+	out.Port = in.Port
+	out.Address = in.Address
+	out.AlgorithmProvider = in.AlgorithmProvider
+	out.PolicyConfigFile = in.PolicyConfigFile
+	if err := api.Convert_bool_ref_To_bool(&in.EnableProfiling, &out.EnableProfiling, s); err != nil {
+		return err
+	}
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.SchedulerName = in.SchedulerName
+	if err := Convert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Convert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration(in *KubeSchedulerConfiguration, out *componentconfig.KubeSchedulerConfiguration, s conversion.Scope) error {
+	return autoConvert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration(in, out, s)
+}
+
+func autoConvert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderElectionConfiguration(in *LeaderElectionConfiguration, out *componentconfig.LeaderElectionConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*LeaderElectionConfiguration))(in)
+	}
+	if err := api.Convert_bool_ref_To_bool(&in.LeaderElect, &out.LeaderElect, s); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.LeaseDuration, &out.LeaseDuration, 0); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.RenewDeadline, &out.RenewDeadline, 0); err != nil {
+		return err
+	}
+	if err := s.Convert(&in.RetryPeriod, &out.RetryPeriod, 0); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Convert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderElectionConfiguration(in *LeaderElectionConfiguration, out *componentconfig.LeaderElectionConfiguration, s conversion.Scope) error {
+	return autoConvert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderElectionConfiguration(in, out, s)
+}
+
 func init() {
 	err := api.Scheme.AddGeneratedConversionFuncs(
 		autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration,
+		autoConvert_componentconfig_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfiguration,
+		autoConvert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration,
 		autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration,
+		autoConvert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration,
+		autoConvert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderElectionConfiguration,
 	)
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.

pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go

@@ -68,11 +68,55 @@ func deepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *Ku
 	return nil
 }
 
+func deepCopy_v1alpha1_KubeSchedulerConfiguration(in KubeSchedulerConfiguration, out *KubeSchedulerConfiguration, c *conversion.Cloner) error {
+	if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+		return err
+	}
+	out.Port = in.Port
+	out.Address = in.Address
+	out.AlgorithmProvider = in.AlgorithmProvider
+	out.PolicyConfigFile = in.PolicyConfigFile
+	if in.EnableProfiling != nil {
+		out.EnableProfiling = new(bool)
+		*out.EnableProfiling = *in.EnableProfiling
+	} else {
+		out.EnableProfiling = nil
+	}
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.SchedulerName = in.SchedulerName
+	if err := deepCopy_v1alpha1_LeaderElectionConfiguration(in.LeaderElection, &out.LeaderElection, c); err != nil {
+		return err
+	}
+	return nil
+}
+
+func deepCopy_v1alpha1_LeaderElectionConfiguration(in LeaderElectionConfiguration, out *LeaderElectionConfiguration, c *conversion.Cloner) error {
+	if in.LeaderElect != nil {
+		out.LeaderElect = new(bool)
+		*out.LeaderElect = *in.LeaderElect
+	} else {
+		out.LeaderElect = nil
+	}
+	if err := deepCopy_unversioned_Duration(in.LeaseDuration, &out.LeaseDuration, c); err != nil {
+		return err
+	}
+	if err := deepCopy_unversioned_Duration(in.RenewDeadline, &out.RenewDeadline, c); err != nil {
+		return err
+	}
+	if err := deepCopy_unversioned_Duration(in.RetryPeriod, &out.RetryPeriod, c); err != nil {
+		return err
+	}
+	return nil
+}
+
 func init() {
 	err := api.Scheme.AddGeneratedDeepCopyFuncs(
 		deepCopy_unversioned_Duration,
 		deepCopy_unversioned_TypeMeta,
 		deepCopy_v1alpha1_KubeProxyConfiguration,
+		deepCopy_v1alpha1_KubeSchedulerConfiguration,
+		deepCopy_v1alpha1_LeaderElectionConfiguration,
 	)
 	if err != nil {
 		// if one of the deep copy functions is malformed, detect it immediately.

pkg/apis/componentconfig/v1alpha1/defaults.go

@@ -19,8 +19,10 @@ package v1alpha1
 import (
 	"time"
 
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/kubelet/qos"
+	"k8s.io/kubernetes/pkg/master/ports"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
@@ -44,5 +46,37 @@ func addDefaultingFuncs(scheme *runtime.Scheme) {
 				obj.IPTablesSyncPeriod = unversioned.Duration{5 * time.Second}
 			}
 		},
+		func(obj *KubeSchedulerConfiguration) {
+			if obj.Port == 0 {
+				obj.Port = ports.SchedulerPort
+			}
+			if obj.Address == "" {
+				obj.Address = "0.0.0.0"
+			}
+			if obj.AlgorithmProvider == "" {
+				obj.AlgorithmProvider = "DefaultProvider"
+			}
+			if obj.KubeAPIQPS == 0 {
+				obj.KubeAPIQPS = 50.0
+			}
+			if obj.KubeAPIBurst == 0 {
+				obj.KubeAPIBurst = 100
+			}
+			if obj.SchedulerName == "" {
+				obj.SchedulerName = api.DefaultSchedulerName
+			}
+		},
+		func(obj *LeaderElectionConfiguration) {
+			zero := unversioned.Duration{}
+			if obj.LeaseDuration == zero {
+				obj.LeaseDuration = unversioned.Duration{15 * time.Second}
+			}
+			if obj.RenewDeadline == zero {
+				obj.RenewDeadline = unversioned.Duration{10 * time.Second}
+			}
+			if obj.RetryPeriod == zero {
+				obj.RetryPeriod = unversioned.Duration{2 * time.Second}
+			}
+		},
 	)
 }

pkg/apis/componentconfig/v1alpha1/register.go

@@ -35,7 +35,9 @@ func AddToScheme(scheme *runtime.Scheme) {
 func addKnownTypes(scheme *runtime.Scheme) {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&KubeProxyConfiguration{},
+		&KubeSchedulerConfiguration{},
 	)
 }
 
-func (obj *KubeProxyConfiguration) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }
+func (obj *KubeProxyConfiguration) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }
+func (obj *KubeSchedulerConfiguration) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }

pkg/apis/componentconfig/v1alpha1/types.go

@@ -74,3 +74,53 @@ const (
 	ProxyModeUserspace ProxyMode = "userspace"
 	ProxyModeIPTables  ProxyMode = "iptables"
 )
+
+type KubeSchedulerConfiguration struct {
+	unversioned.TypeMeta
+
+	// port is the port that the scheduler's http service runs on.
+	Port int `json:"port"`
+	// address is the IP address to serve on.
+	Address string `json:"address"`
+	// algorithmProvider is the scheduling algorithm provider to use.
+	AlgorithmProvider string `json:"algorithmProvider"`
+	// policyConfigFile is the filepath to the scheduler policy configuration.
+	PolicyConfigFile string `json:"policyConfigFile"`
+	// enableProfiling enables profiling via web interface.
+	EnableProfiling *bool `json:"enableProfiling"`
+	// kubeAPIQPS is the QPS to use while talking with kubernetes apiserver.
+	KubeAPIQPS float32 `json:"kubeAPIQPS"`
+	// kubeAPIBurst is the QPS burst to use while talking with kubernetes apiserver.
+	KubeAPIBurst int `json:"kubeAPIBurst"`
+	// schedulerName is name of the scheduler, used to select which pods
+	// will be processed by this scheduler, based on pod's annotation with
+	// key 'scheduler.alpha.kubernetes.io/name'.
+	SchedulerName string `json:"schedulerName"`
+	// leaderElection defines the configuration of leader election client.
+	LeaderElection LeaderElectionConfiguration `json:"leaderElection"`
+}
+
+// LeaderElectionConfiguration defines the configuration of leader election
+// clients for components that can run with leader election enabled.
+type LeaderElectionConfiguration struct {
+	// leaderElect enables a leader election client to gain leadership
+	// before executing the main loop. Enable this when running replicated
+	// components for high availability.
+	LeaderElect *bool `json:"leaderElect"`
+	// leaseDuration is the duration that non-leader candidates will wait
+	// after observing a leadership renewal until attempting to acquire
+	// leadership of a led but unrenewed leader slot. This is effectively the
+	// maximum duration that a leader can be stopped before it is replaced
+	// by another candidate. This is only applicable if leader election is
+	// enabled.
+	LeaseDuration unversioned.Duration `json:"leaseDuration"`
+	// renewDeadline is the interval between attempts by the acting master to
+	// renew a leadership slot before it stops leading. This must be less
+	// than or equal to the lease duration. This is only applicable if leader
+	// election is enabled.
+	RenewDeadline unversioned.Duration `json:"renewDeadline"`
+	// retryPeriod is the duration the clients should wait between attempting
+	// acquisition and renewal of a leadership. This is only applicable if
+	// leader election is enabled.
+	RetryPeriod unversioned.Duration `json:"retryPeriod"`
+}

plugin/cmd/kube-scheduler/app/options/options.go

@@ -20,8 +20,8 @@ package options
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
+	"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
 	"k8s.io/kubernetes/pkg/client/leaderelection"
-	"k8s.io/kubernetes/pkg/master/ports"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/factory"
 
 	"github.com/spf13/pflag"
@@ -40,16 +40,10 @@ type SchedulerServer struct {
 
 // NewSchedulerServer creates a new SchedulerServer with default parameters
 func NewSchedulerServer() *SchedulerServer {
+	config := componentconfig.KubeSchedulerConfiguration{}
+	api.Scheme.Convert(&v1alpha1.KubeSchedulerConfiguration{}, &config)
 	s := SchedulerServer{
-		KubeSchedulerConfiguration: componentconfig.KubeSchedulerConfiguration{
+		KubeSchedulerConfiguration: config,
-			Port:              ports.SchedulerPort,
-			Address:           "0.0.0.0",
-			AlgorithmProvider: factory.DefaultProvider,
-			KubeAPIQPS:        50.0,
-			KubeAPIBurst:      100,
-			SchedulerName:     api.DefaultSchedulerName,
-			LeaderElection:    leaderelection.DefaultLeaderElectionConfiguration(),
-		},
 	}
 	return &s
 }