Deprecate type setting

Signed-off-by: rickbrouwer <[email protected]>

Author: rickbrouwer

pkg/scalers/cpu_memory_scaler.go

@@ -21,7 +21,7 @@ type cpuMemoryScaler struct {
 }
 
 type cpuMemoryMetadata struct {
-	Type               string `keda:"name=type,          order=triggerMetadata, enum=Utilization;AverageValue, optional, deprecatedAnnounce=The 'type' setting is DEPRECATED and will be removed in v2.18 - Use 'metricType' instead."`
+	Type               string `keda:"name=type,          order=triggerMetadata, enum=Utilization;AverageValue, optional, deprecated=The 'type' setting is DEPRECATED and is removed in v2.18 - Use 'metricType' instead."`
 	Value              string `keda:"name=value,         order=triggerMetadata"`
 	ContainerName      string `keda:"name=containerName, order=triggerMetadata, optional"`
 	AverageValue       *resource.Quantity
@@ -58,18 +58,6 @@ func parseResourceMetadata(config *scalersconfig.ScalerConfig) (cpuMemoryMetadat
 		meta.MetricType = config.MetricType
 	}
 
-	// This is deprecated and can be removed later
-	if meta.Type != "" {
-		switch meta.Type {
-		case "AverageValue":
-			meta.MetricType = v2.AverageValueMetricType
-		case "Utilization":
-			meta.MetricType = v2.UtilizationMetricType
-		default:
-			return meta, fmt.Errorf("unknown metric type: %s, allowed values are 'Utilization' or 'AverageValue'", meta.Type)
-		}
-	}
-
 	switch meta.MetricType {
 	case v2.AverageValueMetricType:
 		averageValueQuantity := resource.MustParse(meta.Value)

pkg/scalers/cpu_memory_scaler_test.go

@@ -18,27 +18,20 @@ type parseCPUMemoryMetadataTestData struct {
 }
 
 var validCPUMemoryMetadata = map[string]string{
-	"type":  "Utilization",
 	"value": "50",
 }
 var validContainerCPUMemoryMetadata = map[string]string{
-	"type":          "Utilization",
 	"value":         "50",
 	"containerName": "foo",
 }
 
 var testCPUMemoryMetadata = []parseCPUMemoryMetadataTestData{
 	{"", map[string]string{}, true},
-	{"", validCPUMemoryMetadata, false},
-	{"", validContainerCPUMemoryMetadata, false},
-	{"", map[string]string{"type": "Utilization", "value": "50"}, false},
 	{v2.UtilizationMetricType, map[string]string{"value": "50"}, false},
-	{"", map[string]string{"type": "AverageValue", "value": "50"}, false},
 	{v2.AverageValueMetricType, map[string]string{"value": "50"}, false},
-	{"", map[string]string{"type": "Value", "value": "50"}, true},
 	{v2.ValueMetricType, map[string]string{"value": "50"}, true},
-	{"", map[string]string{"type": "AverageValue"}, true},
-	{"", map[string]string{"type": "xxx", "value": "50"}, true},
+	{"", map[string]string{"value": ""}, true},
+	{"", map[string]string{}, true},
 }
 
 func TestCPUMemoryParseMetadata(t *testing.T) {
@@ -58,34 +51,23 @@ func TestCPUMemoryParseMetadata(t *testing.T) {
 }
 
 func TestGetMetricSpecForScaling(t *testing.T) {
-	// Using trigger.metadata.type field for type
 	config := &scalersconfig.ScalerConfig{
 		TriggerMetadata: validCPUMemoryMetadata,
+		MetricType:      v2.UtilizationMetricType,
 	}
 	scaler, _ := NewCPUMemoryScaler(v1.ResourceCPU, config)
 	metricSpec := scaler.GetMetricSpecForScaling(context.Background())
 
 	assert.Equal(t, metricSpec[0].Type, v2.ResourceMetricSourceType)
 	assert.Equal(t, metricSpec[0].Resource.Name, v1.ResourceCPU)
 	assert.Equal(t, metricSpec[0].Resource.Target.Type, v2.UtilizationMetricType)
-
-	// Using trigger.metricType field for type
-	config = &scalersconfig.ScalerConfig{
-		TriggerMetadata: map[string]string{"value": "50"},
-		MetricType:      v2.UtilizationMetricType,
-	}
-	scaler, _ = NewCPUMemoryScaler(v1.ResourceCPU, config)
-	metricSpec = scaler.GetMetricSpecForScaling(context.Background())
-
-	assert.Equal(t, metricSpec[0].Type, v2.ResourceMetricSourceType)
-	assert.Equal(t, metricSpec[0].Resource.Name, v1.ResourceCPU)
-	assert.Equal(t, metricSpec[0].Resource.Target.Type, v2.UtilizationMetricType)
 }
 
+
 func TestGetContainerMetricSpecForScaling(t *testing.T) {
-	// Using trigger.metadata.type field for type
 	config := &scalersconfig.ScalerConfig{
 		TriggerMetadata: validContainerCPUMemoryMetadata,
+		MetricType:      v2.UtilizationMetricType,
 	}
 	scaler, _ := NewCPUMemoryScaler(v1.ResourceCPU, config)
 	metricSpec := scaler.GetMetricSpecForScaling(context.Background())
@@ -94,17 +76,4 @@ func TestGetContainerMetricSpecForScaling(t *testing.T) {
 	assert.Equal(t, metricSpec[0].ContainerResource.Name, v1.ResourceCPU)
 	assert.Equal(t, metricSpec[0].ContainerResource.Target.Type, v2.UtilizationMetricType)
 	assert.Equal(t, metricSpec[0].ContainerResource.Container, validContainerCPUMemoryMetadata["containerName"])
-
-	// Using trigger.metricType field for type
-	config = &scalersconfig.ScalerConfig{
-		TriggerMetadata: map[string]string{"value": "50", "containerName": "bar"},
-		MetricType:      v2.UtilizationMetricType,
-	}
-	scaler, _ = NewCPUMemoryScaler(v1.ResourceCPU, config)
-	metricSpec = scaler.GetMetricSpecForScaling(context.Background())
-
-	assert.Equal(t, metricSpec[0].Type, v2.ContainerResourceMetricSourceType)
-	assert.Equal(t, metricSpec[0].ContainerResource.Name, v1.ResourceCPU)
-	assert.Equal(t, metricSpec[0].ContainerResource.Target.Type, v2.UtilizationMetricType)
-	assert.Equal(t, metricSpec[0].ContainerResource.Container, "bar")
 }