Remove activationLagThreshold to fix 0->1 scaling (knative-extensions…

…#3479) (#902) Signed-off-by: Calum Murray <[email protected]>
openshift-knative · Dec 5, 2023 · 3c603de · 3c603de
1 parent 8d29ba1
commit 3c603de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/control-plane/pkg/autoscaler/config.go b/control-plane/pkg/autoscaler/config.go
@@ -38,7 +38,6 @@ func defaultConfig() *AutoscalerConfig {
 			AutoscalingPollingIntervalAnnotation: DefaultPollingInterval,
 			AutoscalingCooldownPeriodAnnotation:  DefaultCooldownPeriod,
 			AutoscalingLagThreshold:              DefaultLagThreshold,
-			AutoscalingActivationLagThreshold:    DefaultActivationLagThreshold,
 		},
 	}
 }

diff --git a/control-plane/pkg/autoscaler/keda/keda.go b/control-plane/pkg/autoscaler/keda/keda.go
@@ -62,24 +62,18 @@ func GenerateScaleTriggers(cg *kafkainternals.ConsumerGroup, triggerAuthenticati
 		return nil, err
 	}
 
-	activationLagThreshold, err := GetInt32ValueFromMap(cg.Annotations, autoscaler.AutoscalingActivationLagThreshold, aconfig.AutoscalerDefaults[autoscaler.AutoscalingActivationLagThreshold])
-	if err != nil {
-		return nil, err
-	}
-
 	allowIdleConsumers := "false"
 	if cg.Status.Placements != nil {
 		allowIdleConsumers = "true"
 	}
 
 	for _, topic := range cg.Spec.Template.Spec.Topics {
 		triggerMetadata := map[string]string{
-			"bootstrapServers":       bootstrapServers,
-			"consumerGroup":          consumerGroup,
-			"topic":                  topic,
-			"lagThreshold":           strconv.Itoa(int(*lagThreshold)),
-			"activationLagThreshold": strconv.Itoa(int(*activationLagThreshold)),
-			"allowIdleConsumers":     allowIdleConsumers,
+			"bootstrapServers":   bootstrapServers,
+			"consumerGroup":      consumerGroup,
+			"topic":              topic,
+			"lagThreshold":       strconv.Itoa(int(*lagThreshold)),
+			"allowIdleConsumers": allowIdleConsumers,
 		}
 
 		trigger := kedav1alpha1.ScaleTriggers{