Add new autoscaling target processing for concurrency (caraml-dev#378)

deadlycoconuts · May 7, 2024 · 2b9c56e · 2b9c56e
1 parent 84339fa
commit 2b9c56e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/api/turing/cluster/knative_service.go b/api/turing/cluster/knative_service.go
@@ -206,6 +206,16 @@ func (cfg *KnativeService) getAutoscalingTarget() (string, error) {
 		// Divide value by (1024^2) to convert to Mi
 		return fmt.Sprintf("%.0f", float64(targetResource.Value())/math.Pow(1024, 2)), nil
 
+	} else if cfg.AutoscalingMetric == "concurrency" {
+		rawTarget, err := strconv.ParseFloat(cfg.AutoscalingTarget, 64)
+		if err != nil {
+			return "", err
+		}
+		targetValue := fmt.Sprintf("%.2f", rawTarget)
+		if targetValue == "0.00" {
+			return "", fmt.Errorf("concurrency target %v should be at least 0.01", cfg.AutoscalingTarget)
+		}
+		return targetValue, nil
 	}
 	// For all other metrics, we can use the supplied value as is.
 	return cfg.AutoscalingTarget, nil

diff --git a/api/turing/cluster/knative_service_test.go b/api/turing/cluster/knative_service_test.go
@@ -204,7 +204,7 @@ func TestBuildKnativeServiceConfig(t *testing.T) {
 									"autoscaling.knative.dev/minScale":                     "1",
 									"autoscaling.knative.dev/maxScale":                     "2",
 									"autoscaling.knative.dev/metric":                       "concurrency",
-									"autoscaling.knative.dev/target":                       "1",
+									"autoscaling.knative.dev/target":                       "1.00",
 									"autoscaling.knative.dev/class":                        "kpa.autoscaling.knative.dev",
 									"queue.sidecar.serving.knative.dev/resourcePercentage": "30",
 								},
@@ -256,7 +256,7 @@ func TestBuildKnativeServiceConfig(t *testing.T) {
 									"autoscaling.knative.dev/minScale":                     "1",
 									"autoscaling.knative.dev/maxScale":                     "2",
 									"autoscaling.knative.dev/metric":                       "concurrency",
-									"autoscaling.knative.dev/target":                       "1",
+									"autoscaling.knative.dev/target":                       "1.00",
 									"autoscaling.knative.dev/class":                        "kpa.autoscaling.knative.dev",
 									"queue.sidecar.serving.knative.dev/resourcePercentage": "30",
 								},
@@ -411,7 +411,7 @@ func TestBuildKnativeServiceConfig(t *testing.T) {
 									"autoscaling.knative.dev/minScale":                     "1",
 									"autoscaling.knative.dev/maxScale":                     "2",
 									"autoscaling.knative.dev/metric":                       "concurrency",
-									"autoscaling.knative.dev/target":                       "1",
+									"autoscaling.knative.dev/target":                       "1.00",
 									"autoscaling.knative.dev/class":                        "kpa.autoscaling.knative.dev",
 									"queue.sidecar.serving.knative.dev/resourcePercentage": "30",
 								},
@@ -517,7 +517,7 @@ func TestGetAutoscalingTarget(t *testing.T) {
 				AutoscalingMetric: "concurrency",
 				AutoscalingTarget: "10",
 			},
-			expectedTarget: "10",
+			expectedTarget: "10.00",
 		},
 		"rps": {
 			cfg: &KnativeService{