Merge pull request #807 from k82cn/automated-cherry-pick-of-#725-upstream-release-0.4

Automated cherry pick of #725: add options to enable the feature of PriorityClass

Author: k8s-ci-robot

cmd/kube-batch/app/options/options.go

@@ -42,8 +42,11 @@ type ServerOption struct {
 	DefaultQueue         string
 	PrintVersion         bool
 	ListenAddress        string
+	EnablePriorityClass  bool
 }
 
+var ServerOpts *ServerOption
+
 // NewServerOption creates a new CMServer with a default config.
 func NewServerOption() *ServerOption {
 	s := ServerOption{}
@@ -65,6 +68,8 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&s.PrintVersion, "version", false, "Show version and quit")
 	fs.StringVar(&s.LockObjectNamespace, "lock-object-namespace", s.LockObjectNamespace, "Define the namespace of the lock object")
 	fs.StringVar(&s.ListenAddress, "listen-address", defaultListenAddress, "The address to listen on for HTTP requests.")
+	fs.BoolVar(&s.EnablePriorityClass, "priority-class", true,
+		"Enable PriorityClass to provide the capacity of preemption at pod group level; to disable it, set it false")
 }
 
 func (s *ServerOption) CheckOptionOrDie() error {
@@ -74,3 +79,7 @@ func (s *ServerOption) CheckOptionOrDie() error {
 
 	return nil
 }
+
+func (s *ServerOption) RegisterOptions() {
+	ServerOpts = s
+}

cmd/kube-batch/app/options/options_test.go

@@ -31,6 +31,7 @@ func TestAddFlags(t *testing.T) {
 
 	args := []string{
 		"--schedule-period=5m",
+		"--priority-class=false",
 	}
 	fs.Parse(args)
 

cmd/kube-batch/main.go

@@ -39,6 +39,7 @@ var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum
 func main() {
 	s := options.NewServerOption()
 	s.AddFlags(pflag.CommandLine)
+	s.RegisterOptions()
 
 	flag.InitFlags()
 	if err := s.CheckOptionOrDie(); err != nil {

pkg/scheduler/cache/cache.go

@@ -44,6 +44,7 @@ import (
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
 
+	"github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options"
 	"github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
 	kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
 	"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme"
@@ -304,7 +305,10 @@ func (sc *SchedulerCache) Run(stopCh <-chan struct{}) {
 	go sc.pvcInformer.Informer().Run(stopCh)
 	go sc.scInformer.Informer().Run(stopCh)
 	go sc.queueInformer.Informer().Run(stopCh)
-	go sc.pcInformer.Informer().Run(stopCh)
+
+	if options.ServerOpts.EnablePriorityClass {
+		go sc.pcInformer.Informer().Run(stopCh)
+	}
 
 	// Re-sync error tasks.
 	go wait.Until(sc.processResyncTask, 0, stopCh)
@@ -316,15 +320,22 @@ func (sc *SchedulerCache) Run(stopCh <-chan struct{}) {
 func (sc *SchedulerCache) WaitForCacheSync(stopCh <-chan struct{}) bool {
 
 	return cache.WaitForCacheSync(stopCh,
-		sc.pdbInformer.Informer().HasSynced,
-		sc.podInformer.Informer().HasSynced,
-		sc.podGroupInformer.Informer().HasSynced,
-		sc.nodeInformer.Informer().HasSynced,
-		sc.pvInformer.Informer().HasSynced,
-		sc.pvcInformer.Informer().HasSynced,
-		sc.scInformer.Informer().HasSynced,
-		sc.queueInformer.Informer().HasSynced,
-		sc.pcInformer.Informer().HasSynced,
+		func() []cache.InformerSynced {
+			informerSynced := []cache.InformerSynced{
+				sc.pdbInformer.Informer().HasSynced,
+				sc.podInformer.Informer().HasSynced,
+				sc.podGroupInformer.Informer().HasSynced,
+				sc.nodeInformer.Informer().HasSynced,
+				sc.pvInformer.Informer().HasSynced,
+				sc.pvcInformer.Informer().HasSynced,
+				sc.scInformer.Informer().HasSynced,
+				sc.queueInformer.Informer().HasSynced,
+			}
+			if options.ServerOpts.EnablePriorityClass {
+				informerSynced = append(informerSynced, sc.pcInformer.Informer().HasSynced)
+			}
+			return informerSynced
+		}()...,
 	)
 }