Drop support to ValueMetricType using cpu_memory_scaler (#2218)

Signed-off-by: Jorge Turrado <jorge.turrado@docplanner.com>
kedacore · Oct 27, 2021 · 49d60dc · 49d60dc
1 parent d1bed54
commit 49d60dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -61,6 +61,7 @@
 - Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090))
 - Prometheus scaler: omit `serverAddress` from generated metric name ([#2099](https://github.com/kedacore/keda/pull/2099))
 - Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090)|[#2184](https://github.com/kedacore/keda/pull/2184))
+- Drop support to `ValueMetricType` using cpu_memory_scaler ([#2218](https://github.com/kedacore/keda/issues/2218))
 
 ## v2.4.0
 

diff --git a/pkg/scalers/cpu_memory_scaler.go b/pkg/scalers/cpu_memory_scaler.go
@@ -19,7 +19,6 @@ type cpuMemoryScaler struct {
 
 type cpuMemoryMetadata struct {
 	Type               v2beta2.MetricTargetType
-	Value              *resource.Quantity
 	AverageValue       *resource.Quantity
 	AverageUtilization *int32
 }
@@ -51,9 +50,6 @@ func parseResourceMetadata(config *ScalerConfig) (*cpuMemoryMetadata, error) {
 		return nil, fmt.Errorf("no value given")
 	}
 	switch meta.Type {
-	case v2beta2.ValueMetricType:
-		valueQuantity := resource.MustParse(value)
-		meta.Value = &valueQuantity
 	case v2beta2.AverageValueMetricType:
 		averageValueQuantity := resource.MustParse(value)
 		meta.AverageValue = &averageValueQuantity
@@ -65,7 +61,7 @@ func parseResourceMetadata(config *ScalerConfig) (*cpuMemoryMetadata, error) {
 		utilizationNum := int32(valueNum)
 		meta.AverageUtilization = &utilizationNum
 	default:
-		return nil, fmt.Errorf("unsupport type")
+		return nil, fmt.Errorf("unsupported metric type, allowed values are 'Utilization' or 'AverageValue'")
 	}
 	return meta, nil
 }
@@ -86,7 +82,6 @@ func (s *cpuMemoryScaler) GetMetricSpecForScaling(context.Context) []v2beta2.Met
 		Name: s.resourceName,
 		Target: v2beta2.MetricTarget{
 			Type:               s.metadata.Type,
-			Value:              s.metadata.Value,
 			AverageUtilization: s.metadata.AverageUtilization,
 			AverageValue:       s.metadata.AverageValue,
 		},

diff --git a/pkg/scalers/cpu_memory_scaler_test.go b/pkg/scalers/cpu_memory_scaler_test.go
@@ -24,8 +24,8 @@ var testCPUMemoryMetadata = []parseCPUMemoryMetadataTestData{
 	{map[string]string{}, true},
 	{validCPUMemoryMetadata, false},
 	{map[string]string{"type": "Utilization", "value": "50"}, false},
-	{map[string]string{"type": "Value", "value": "50"}, false},
 	{map[string]string{"type": "AverageValue", "value": "50"}, false},
+	{map[string]string{"type": "Value", "value": "50"}, true},
 	{map[string]string{"type": "AverageValue"}, true},
 	{map[string]string{"type": "xxx", "value": "50"}, true},
 }