Add support of scaling rules for horizontal scaling

go.mod

@@ -140,7 +140,7 @@ require (
 	github.com/DataDog/datadog-agent/pkg/util/pointer v0.55.0-rc.3
 	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.55.0-rc.3
 	github.com/DataDog/datadog-go/v5 v5.5.0
-	github.com/DataDog/datadog-operator v0.7.1-0.20240522081847-e83dd785258a
+	github.com/DataDog/datadog-operator v0.7.1-0.20240627103854-fe86c2214d4c
 	github.com/DataDog/ebpf-manager v0.6.1
 	github.com/DataDog/gopsutil v1.2.2
 	github.com/DataDog/nikos v1.12.4

pkg/clusteragent/autoscaling/processor.go

@@ -27,6 +27,27 @@ func (p ProcessResult) ShouldRequeue() bool {
 	return p.Requeue || p.RequeueAfter > 0
 }
 
+// After returns a copy of current ProcessResult with RequeueAfter set to the given duration
+func (p ProcessResult) After(after time.Duration) ProcessResult {
+	p.RequeueAfter = after
+	return p
+}
+
+// Merge merges the other ProcessResult into a newly returned one
+func (p ProcessResult) Merge(other ProcessResult) ProcessResult {
+	if other.Requeue {
+		p.Requeue = true
+
+		if p.Requeue {
+			p.RequeueAfter = min(p.RequeueAfter, other.RequeueAfter)
+		} else {
+			p.RequeueAfter = other.RequeueAfter
+		}
+	}
+
+	return p
+}
+
 var (
 	// Requeue is a shortcut to avoid having ProcessResult{Requeue: true} everywhere in the code
 	Requeue = ProcessResult{Requeue: true}

pkg/clusteragent/autoscaling/workload/config_retriever_settings_test.go

@@ -104,7 +104,7 @@ func TestConfigRetriverAutoscalingSettingsLeader(t *testing.T) {
 			Name:       "deploy3",
 		},
 		Policy: &datadoghq.DatadogPodAutoscalerPolicy{
-			ApplyMode: datadoghq.DatadogPodAutoscalerAllApplyNone,
+			ApplyMode: datadoghq.DatadogPodAutoscalerNoneApplyMode,
 			Update: &datadoghq.DatadogPodAutoscalerUpdatePolicy{
 				Strategy: datadoghq.DatadogPodAutoscalerAutoUpdateStrategy,
 			},

pkg/clusteragent/autoscaling/workload/controller.go

@@ -276,7 +276,12 @@ func (c *Controller) handleScaling(ctx context.Context, podAutoscaler *datadoghq
 		return horizontalRes, err
 	}
 
-	return c.verticalController.sync(ctx, podAutoscaler, podAutoscalerInternal)
+	verticalRes, err := c.verticalController.sync(ctx, podAutoscaler, podAutoscalerInternal)
+	if err != nil {
+		return verticalRes, err
+	}
+
+	return horizontalRes.Merge(verticalRes), nil
 }
 
 func (c *Controller) createPodAutoscaler(ctx context.Context, podAutoscalerInternal model.PodAutoscalerInternal) error {