Merge branch 'master' into fix-backfill-20250213

volcano-sh · Feb 13, 2025 · 5cc0922 · 5cc0922
2 parents da7300a + 6b5bf18
commit 5cc0922
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cmd/network-qos/tools/options/options.go b/cmd/network-qos/tools/options/options.go
@@ -39,5 +39,5 @@ func (o *Options) AddFlags(c *cobra.Command) {
 		"bandwidth usage of online jobs exceeds the defined threshold(online-bandwidth-watermark)")
 	c.Flags().StringVar(&o.OfflineHighBandwidth, utils.OfflineHighBandwidthKey, o.OfflineHighBandwidth, "offline-high-bandwidth is the maximum amount of network bandwidth that can be used by offline jobs when the"+
 		"bandwidth usage of online jobs not reach to the defined threshold(online-bandwidth-watermark)")
-	c.Flags().BoolVar(&o.EnableNetworkQoS, utils.EnableNetworkQoS, o.EnableNetworkQoS, "enbale networkqos")
+	c.Flags().BoolVar(&o.EnableNetworkQoS, utils.EnableNetworkQoS, o.EnableNetworkQoS, "enable networkqos")
 }
diff --git a/cmd/scheduler/app/options/options.go b/cmd/scheduler/app/options/options.go
@@ -133,8 +133,8 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
 	// Minimum percentage of nodes to find and score
 	fs.Int32Var(&s.MinPercentageOfNodesToFind, "minimum-percentage-nodes-to-find", defaultMinPercentageOfNodesToFind, "The minimum percentage of nodes to find and score")
 
-	// The percentage of nodes that would be scored in each scheduling cycle; if <= 0, an adpative percentage will be calcuated
-	fs.Int32Var(&s.PercentageOfNodesToFind, "percentage-nodes-to-find", defaultPercentageOfNodesToFind, "The percentage of nodes to find and score, if <=0 will be calcuated based on the cluster size")
+	// The percentage of nodes that would be scored in each scheduling cycle; if <= 0, an adaptive percentage will be calculated
+	fs.Int32Var(&s.PercentageOfNodesToFind, "percentage-nodes-to-find", defaultPercentageOfNodesToFind, "The percentage of nodes to find and score, if <=0 will be calculated based on the cluster size")
 
 	fs.StringVar(&s.PluginsDir, "plugins-dir", defaultPluginsDir, "vc-scheduler will load custom plugins which are in this directory")
 	fs.BoolVar(&s.EnableCSIStorage, "csi-storage", false,

diff --git a/pkg/agent/config/configmgr.go b/pkg/agent/config/configmgr.go
@@ -103,7 +103,7 @@ func (m *ConfigManager) PrepareConfigmap() error {
 	})
 	if waitErr != nil {
 		klog.ErrorS(waitErr, "Failed to wait for creating configMap")
-		return fmt.Errorf("failed to create configmap(%s:%s), waitting error: %v, latest creation error: %v",
+		return fmt.Errorf("failed to create configmap(%s:%s), waiting error: %v, latest creation error: %v",
 			m.agentPodNamespace, utils.ConfigMapName, waitErr, lastCreateErr)
 	}
 	return nil

diff --git a/pkg/agent/config/source/configmap_source.go b/pkg/agent/config/source/configmap_source.go
@@ -96,14 +96,14 @@ func (cs *configMapSource) nodeAdd(obj interface{}) {
 func (cs *configMapSource) nodeUpdate(oldObj, newObj interface{}) {
 	oldNode, ok := oldObj.(*corev1.Node)
 	if !ok {
-		klog.ErrorS(nil, "can not covert interface object to Node", "oldobj", oldObj)
+		klog.ErrorS(nil, "can not convert interface object to Node", "oldobj", oldObj)
 		cs.queue.Add("node")
 		return
 	}
 
 	newNode, ok := newObj.(*corev1.Node)
 	if !ok {
-		klog.ErrorS(nil, "can not covert interface object to Node", "newobj", newObj)
+		klog.ErrorS(nil, "can not convert interface object to Node", "newobj", newObj)
 		cs.queue.Add("node")
 		return
 	}

diff --git a/pkg/agent/features/feature_gate.go b/pkg/agent/features/feature_gate.go
@@ -103,7 +103,7 @@ func IsUnsupportedError(err error) bool {
 
 func (f *featureGate) Supported(feature Feature, cfg *config.Configuration) error {
 	if !cfg.IsFeatureSupported(string(feature)) {
-		return UnsupportedError(fmt.Sprintf("feature(%s) is not supprted by volcano-agent", string(feature)))
+		return UnsupportedError(fmt.Sprintf("feature(%s) is not supported by volcano-agent", string(feature)))
 	}
 
 	switch feature {