Merge pull request volcano-sh#251 from k82cn/ka_247_2

k82cn · web-flow · commit a2b3e74b08bd · 2018-06-27T19:58:52.000+08:00
Renamed actions to action.
diff --git a/cmd/kar-scheduler/app/options/options.go b/cmd/kar-scheduler/app/options/options.go
@@ -40,7 +40,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.")
 	// kube-arbitrator will ignore pods with scheduler names other than specified with the option
 	fs.StringVar(&s.SchedulerName, "scheduler-name", "kar-scheduler", "kube-arbitrator will handle pods with the scheduler-name")
-	fs.StringArrayVar(&s.Actions, "actions", []string{"decorate", "allocate"}, "The actions that executed by scheduler")
+	fs.StringArrayVar(&s.Actions, "action", []string{"decorate", "allocate"}, "The actions that executed by scheduler")
 }
 
 func (s *ServerOption) CheckOptionOrDie() {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (s ServerOption) AddFlags(fs pflag.FlagSet) {`
`40`	`40`	`fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization and master location information.")`
`41`	`41`	`// kube-arbitrator will ignore pods with scheduler names other than specified with the option`
`42`	`42`	`fs.StringVar(&s.SchedulerName, "scheduler-name", "kar-scheduler", "kube-arbitrator will handle pods with the scheduler-name")`
`43`		`- fs.StringArrayVar(&s.Actions, "actions", []string{"decorate", "allocate"}, "The actions that executed by scheduler")`
	`43`	`+ fs.StringArrayVar(&s.Actions, "action", []string{"decorate", "allocate"}, "The actions that executed by scheduler")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func (s *ServerOption) CheckOptionOrDie() {`