Merge pull request #494 from Fish-pro/chore/unconvert

k8s-ci-robot · web-flow · commit ca2ca69ab8b8 · 2023-02-01T12:37:46.000-08:00
Clean up unnecessary convert
diff --git a/apis/config/v1/defaults.go b/apis/config/v1/defaults.go
@@ -99,7 +99,7 @@ func SetDefaults_NodeResourcesAllocatableArgs(obj *NodeResourcesAllocatableArgs)
 // SetDefaultTrimaranSpec sets the default parameters for common Trimaran plugins
 func SetDefaultTrimaranSpec(args *TrimaranSpec) {
 	if args.WatcherAddress == nil && args.MetricProvider.Type == "" {
-		args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)
+		args.MetricProvider.Type = DefaultMetricProviderType
 	}
 	if args.MetricProvider.Type == Prometheus && args.MetricProvider.InsecureSkipVerify == nil {
 		args.MetricProvider.InsecureSkipVerify = &DefaultInsecureSkipVerify
diff --git a/apis/config/v1beta2/defaults.go b/apis/config/v1beta2/defaults.go
@@ -107,7 +107,7 @@ func SetDefaults_TargetLoadPackingArgs(args *TargetLoadPackingArgs) {
 		args.TargetUtilization = &DefaultTargetUtilizationPercent
 	}
 	if args.WatcherAddress == nil && args.MetricProvider.Type == "" {
-		args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)
+		args.MetricProvider.Type = DefaultMetricProviderType
 	}
 	if args.MetricProvider.Type == Prometheus && args.MetricProvider.InsecureSkipVerify == nil {
 		args.MetricProvider.InsecureSkipVerify = &DefaultInsecureSkipVerify
@@ -117,7 +117,7 @@ func SetDefaults_TargetLoadPackingArgs(args *TargetLoadPackingArgs) {
 // SetDefaults_LoadVariationRiskBalancingArgs sets the default parameters for LoadVariationRiskBalancing plugin
 func SetDefaults_LoadVariationRiskBalancingArgs(args *LoadVariationRiskBalancingArgs) {
 	if args.WatcherAddress == nil && args.MetricProvider.Type == "" {
-		args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)
+		args.MetricProvider.Type = DefaultMetricProviderType
 	}
 	if args.SafeVarianceMargin == nil || *args.SafeVarianceMargin < 0 {
 		args.SafeVarianceMargin = &DefaultSafeVarianceMargin
diff --git a/apis/config/v1beta3/defaults.go b/apis/config/v1beta3/defaults.go
@@ -99,7 +99,7 @@ func SetDefaults_NodeResourcesAllocatableArgs(obj *NodeResourcesAllocatableArgs)
 // SetDefaultTrimaranSpec sets the default parameters for common Trimaran plugins
 func SetDefaultTrimaranSpec(args *TrimaranSpec) {
 	if args.WatcherAddress == nil && args.MetricProvider.Type == "" {
-		args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)
+		args.MetricProvider.Type = DefaultMetricProviderType
 	}
 	if args.MetricProvider.Type == Prometheus && args.MetricProvider.InsecureSkipVerify == nil {
 		args.MetricProvider.InsecureSkipVerify = &DefaultInsecureSkipVerify
diff --git a/pkg/noderesources/allocatable.go b/pkg/noderesources/allocatable.go
@@ -131,7 +131,7 @@ func resourceScorer(resToWeightMap resourceToWeightMap, mode config.ModeType) fu
 }
 
 func score(capacity int64, mode config.ModeType) int64 {
-	switch config.ModeType(mode) {
+	switch mode {
 	case config.Least:
 		return -1 * capacity
 	case config.Most:

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func SetDefaults_NodeResourcesAllocatableArgs(obj *NodeResourcesAllocatableArgs)`
`99`	`99`	`// SetDefaultTrimaranSpec sets the default parameters for common Trimaran plugins`
`100`	`100`	`func SetDefaultTrimaranSpec(args *TrimaranSpec) {`
`101`	`101`	`if args.WatcherAddress == nil && args.MetricProvider.Type == "" {`
`102`		`- args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)`
	`102`	`+ args.MetricProvider.Type = DefaultMetricProviderType`
`103`	`103`	`}`
`104`	`104`	`if args.MetricProvider.Type == Prometheus && args.MetricProvider.InsecureSkipVerify == nil {`
`105`	`105`	`args.MetricProvider.InsecureSkipVerify = &DefaultInsecureSkipVerify`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func SetDefaults_TargetLoadPackingArgs(args *TargetLoadPackingArgs) {`
`107`	`107`	`args.TargetUtilization = &DefaultTargetUtilizationPercent`
`108`	`108`	`}`
`109`	`109`	`if args.WatcherAddress == nil && args.MetricProvider.Type == "" {`
`110`		`- args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)`
	`110`	`+ args.MetricProvider.Type = DefaultMetricProviderType`
`111`	`111`	`}`
`112`	`112`	`if args.MetricProvider.Type == Prometheus && args.MetricProvider.InsecureSkipVerify == nil {`
`113`	`113`	`args.MetricProvider.InsecureSkipVerify = &DefaultInsecureSkipVerify`
`@@ -117,7 +117,7 @@ func SetDefaults_TargetLoadPackingArgs(args *TargetLoadPackingArgs) {`
`117`	`117`	`// SetDefaults_LoadVariationRiskBalancingArgs sets the default parameters for LoadVariationRiskBalancing plugin`
`118`	`118`	`func SetDefaults_LoadVariationRiskBalancingArgs(args *LoadVariationRiskBalancingArgs) {`
`119`	`119`	`if args.WatcherAddress == nil && args.MetricProvider.Type == "" {`
`120`		`- args.MetricProvider.Type = MetricProviderType(DefaultMetricProviderType)`
	`120`	`+ args.MetricProvider.Type = DefaultMetricProviderType`
`121`	`121`	`}`
`122`	`122`	`if args.SafeVarianceMargin == nil \|\| *args.SafeVarianceMargin < 0 {`
`123`	`123`	`args.SafeVarianceMargin = &DefaultSafeVarianceMargin`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func resourceScorer(resToWeightMap resourceToWeightMap, mode config.ModeType) fu`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`func score(capacity int64, mode config.ModeType) int64 {`
`134`		`- switch config.ModeType(mode) {`
	`134`	`+ switch mode {`
`135`	`135`	`case config.Least:`
`136`	`136`	`return -1 * capacity`
`137`	`137`	`case config.Most:`