DataDog
diff --git a/‎.github/workflows/backport-pr.yml‎
Lines changed: 48 additions & 7 deletions b/‎.github/workflows/backport-pr.yml‎
Lines changed: 48 additions & 7 deletions
diff --git a/‎Makefile‎
Lines changed: 3 additions & 2 deletions b/‎Makefile‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎api/datadoghq/common/datadogpodautoscaler_types.go‎
Lines changed: 3 additions & 0 deletions b/‎api/datadoghq/common/datadogpodautoscaler_types.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎api/datadoghq/v1alpha1/datadogpodautoscaler_types.go‎
Lines changed: 0 additions & 1 deletion b/‎api/datadoghq/v1alpha1/datadogpodautoscaler_types.go‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎api/datadoghq/v1alpha2/datadogpodautoscaler_types.go‎
Lines changed: 43 additions & 1 deletion b/‎api/datadoghq/v1alpha2/datadogpodautoscaler_types.go‎
Lines changed: 43 additions & 1 deletion
diff --git a/‎api/datadoghq/v1alpha2/zz_generated.deepcopy.go‎
Lines changed: 52 additions & 0 deletions b/‎api/datadoghq/v1alpha2/zz_generated.deepcopy.go‎
Lines changed: 52 additions & 0 deletions
diff --git a/‎cmd/main.go‎
Lines changed: 3 additions & 0 deletions b/‎cmd/main.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers.yaml‎
Lines changed: 28 additions & 2 deletions b/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers.yaml‎
Lines changed: 28 additions & 2 deletions
diff --git a/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers_v1alpha2.json‎
Lines changed: 37 additions & 0 deletions b/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers_v1alpha2.json‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers_v2alpha1.json‎
Lines changed: 1 addition & 1 deletion b/‎config/crd/bases/v1/datadoghq.com_datadogpodautoscalers_v2alpha1.json‎
Lines changed: 1 addition & 1 deletion
@@ -10,22 +10,63 @@ jobs:
     name: Backport PR
     runs-on: ubuntu-latest
     if: >
-        github.event.action == 'labeled'
-        && github.event.pull_request.merged_at != null
-        && contains(github.event.label.name, 'backport/')
+        (github.event_name == 'workflow_dispatch' || 
+        (github.event.action == 'labeled'
+        && contains(github.event.label.name, 'backport/')))
     permissions:
       contents: write
       pull-requests: write
-    steps:
-      - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
+      issues: write
+    steps:    
+      - name: Create app token
+        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
+        id: app-token
+        with:
+          app-id: ${{ secrets.DD_GITHUBOPS_TOKEN_APP_ID }}
+          private-key: ${{ secrets.DD_GITHUBOPS_TOKEN_PRIVATE_KEY }}
+
+      - name: Create backport PR
+        uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
+        id: backport
         with:
           label_pattern: "^backport/(?<base>([^ ]+))$" 
           labels_template: "<%= JSON.stringify([...labels, 'backport', 'bot']) %>"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          title_template: "[ Backport <%- base %> ] <%- title %>"
+          github_token: ${{ steps.app-token.outputs.token }}
+          title_template: "[Backport <%- base %>] <%- title %>"
           body_template: |
             Backport <%- mergeCommitSha %> from #<%- number %>.
 
             ___
 
             <%- body %>
+
+      - name: Copy milestone to backport PR
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        env:
+          BACKPORT_PR: ${{ steps.backport.outputs.created_pull_requests }}
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            console.log('Raw backport output:', process.env.BACKPORT_PR);
+            
+            const orig = context.payload.pull_request;
+            if (!orig.milestone) {
+              console.log('No milestone to copy.');
+              return;
+            }
+            // Get the milestone number
+            const milestoneNumber = orig.milestone.number;
+            console.log('Milestone number:', milestoneNumber);
+            
+            // Parse the backport PR number from the JSON output
+            const backportData = JSON.parse(process.env.BACKPORT_PR);
+            const prNumber = backportData.backport;
+            console.log('Parsed PR number:', prNumber);
+            console.log(`Copying milestone ${milestoneNumber} to PR ${prNumber}`);
+            
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              milestone: milestoneNumber
+            });
@@ -69,8 +69,9 @@ all: build test ## Build test
 build: manager kubectl-datadog ## Builds manager + kubectl plugin
 
 .PHONY: fmt
-fmt: ## Run go fmt against code
+fmt: bin/$(PLATFORM)/golangci-lint ## Run formatters against code
 	go fmt ./...
+	bin/$(PLATFORM)/golangci-lint run ./... --fix
 
 .PHONY: vet
 vet: ## Run go vet against code
@@ -303,7 +304,7 @@ patch-crds: bin/$(PLATFORM)/yq ## Patch-crds
 	hack/patch-crds.sh
 
 .PHONY: lint
-lint: bin/$(PLATFORM)/golangci-lint fmt vet ## Lint
+lint: bin/$(PLATFORM)/golangci-lint vet ## Lint
 	bin/$(PLATFORM)/golangci-lint run ./...
 
 .PHONY: licenses
 
@@ -264,6 +264,9 @@ const (
 
 	// DatadogPodAutoscalerLocalValueSource is a recommendation that comes from the local fallback.
 	DatadogPodAutoscalerLocalValueSource DatadogPodAutoscalerValueSource = "Local"
+
+	// DatadogPodAutoscalerExternalValueSource is a recommendation that comes from an external source.
+	DatadogPodAutoscalerExternalValueSource DatadogPodAutoscalerValueSource = "External"
 )
 
 // DatadogPodAutoscalerHorizontalStatus defines the status of the horizontal scaling
 
@@ -142,7 +142,6 @@ type DatadogPodAutoscalerPolicy struct {
 // +kubebuilder:printcolumn:name="Generated",type="date",JSONPath=".status.vertical.target.generatedAt"
 // +kubebuilder:printcolumn:name="Able to Apply",type="string",JSONPath=".status.conditions[?(@.type=='VerticalAbleToApply')].status"
 // +kubebuilder:printcolumn:name="Last Trigger",type="date",JSONPath=".status.vertical.lastAction.time"
-// +kubebuilder:storageversion
 // DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API
 type DatadogPodAutoscaler struct {
 	metav1.TypeMeta   `json:",inline"`
 
@@ -36,7 +36,7 @@ import (
 //           periodSeconds: 60
 //   objectives:
 //     - type: PodResource
-//       resource:
+//       podResource:
 //         name: cpu
 //         value:
 //           type: Absolute|Utilization
@@ -49,6 +49,11 @@ import (
 //           type: Absolute|Utilization
 //           absolute: 500m
 //           utilization: 80
+//   fallback:
+// 	   horizontal:
+//       enabled: true
+//       triggers:
+//         staleRecommendationThresholdSeconds: 600
 //   constraints:
 //     minReplicas: 1
 //     maxReplicas: 10
@@ -83,6 +88,11 @@ type DatadogPodAutoscalerSpec struct {
 	// +kubebuilder:validation:MinItems=1
 	Objectives []common.DatadogPodAutoscalerObjective `json:"objectives,omitempty"`
 
+	// Fallback defines how recommendations should be applied when in fallback mode.
+	// +optional
+	// +kubebuilder:default={}
+	Fallback *DatadogFallbackPolicy `json:"fallback,omitempty"`
+
 	// Constraints defines constraints that should always be respected.
 	Constraints *common.DatadogPodAutoscalerConstraints `json:"constraints,omitempty"`
 }
@@ -119,6 +129,37 @@ type DatadogPodAutoscalerApplyPolicy struct {
 	ScaleDown *common.DatadogPodAutoscalerScalingPolicy `json:"scaleDown,omitempty"`
 }
 
+// DatadogFallbackPolicy configures the behavior during fallback mode.
+type DatadogFallbackPolicy struct {
+	// Horizontal configures the behavior during horizontal fallback mode.
+	// +optional
+	// +kubebuilder:default={}
+	Horizontal DatadogPodAutoscalerHorizontalFallbackPolicy `json:"horizontal,omitempty"`
+}
+
+// DatadogPodAutoscalerHorizontalFallbackPolicy defines how recommendations should be applied in fallback mode.
+type DatadogPodAutoscalerHorizontalFallbackPolicy struct {
+	// Enabled determines whether recommendations should be applied by the controller:
+	// +optional
+	// +kubebuilder:default=true
+	Enabled bool `json:"enabled"`
+
+	// Triggers defines the triggers that will generate recommendations.
+	// +optional
+	// +kubebuilder:default={}
+	Triggers HorizontalFallbackTriggers `json:"triggers,omitempty"`
+}
+
+// HorizontalFallbackTriggers defines the triggers that will cause local fallback to be enabled.
+type HorizontalFallbackTriggers struct {
+	// StaleRecommendationThresholdSeconds defines the time window the controller will wait after detecting an error before applying recommendations.
+	// +optional
+	// +kubebuilder:default=600
+	// +kubebuilder:validation:Minimum=100
+	// +kubebuilder:validation:Maximum=1200
+	StaleRecommendationThresholdSeconds int32 `json:"staleRecommendationThresholdSeconds,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=dpa
 // +kubebuilder:subresource:status
@@ -134,6 +175,7 @@ type DatadogPodAutoscalerApplyPolicy struct {
 // +kubebuilder:printcolumn:name="Generated",type="date",JSONPath=".status.vertical.target.generatedAt"
 // +kubebuilder:printcolumn:name="Able to Apply",type="string",JSONPath=".status.conditions[?(@.type=='VerticalAbleToApply')].status"
 // +kubebuilder:printcolumn:name="Last Trigger",type="date",JSONPath=".status.vertical.lastAction.time"
+// +kubebuilder:storageversion
 // DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API
 type DatadogPodAutoscaler struct {
 	metav1.TypeMeta   `json:",inline"`
 
@@ -114,6 +114,7 @@ type options struct {
 	edsCanaryAutoFailEnabled               bool
 	edsCanaryAutoFailMaxRestarts           int
 	edsCanaryAutoPauseMaxSlowStartDuration time.Duration
+	edsSlowStartAdditiveIncrease           string
 	supportCilium                          bool
 	datadogAgentEnabled                    bool
 	datadogMonitorEnabled                  bool
@@ -164,6 +165,7 @@ func (opts *options) Parse() {
 	// ExtendedDaemonset configuration
 	flag.BoolVar(&opts.supportExtendedDaemonset, "supportExtendedDaemonset", false, "Support usage of Datadog ExtendedDaemonset CRD.")
 	flag.StringVar(&opts.edsMaxPodUnavailable, "edsMaxPodUnavailable", "", "ExtendedDaemonset number of max unavailable pods during the rolling update")
+	flag.StringVar(&opts.edsSlowStartAdditiveIncrease, "edsSlowStartAdditiveIncrease", "", "ExtendedDaemonset slow start additive increase")
 	flag.StringVar(&opts.edsMaxPodSchedulerFailure, "edsMaxPodSchedulerFailure", "", "ExtendedDaemonset number of max pod scheduler failures")
 	flag.DurationVar(&opts.edsCanaryDuration, "edsCanaryDuration", 10*time.Minute, "ExtendedDaemonset canary duration")
 	flag.StringVar(&opts.edsCanaryReplicas, "edsCanaryReplicas", "", "ExtendedDaemonset number of canary pods")
@@ -295,6 +297,7 @@ func run(opts *options) error {
 		SupportExtendedDaemonset: controller.ExtendedDaemonsetOptions{
 			Enabled:                             opts.supportExtendedDaemonset,
 			MaxPodUnavailable:                   opts.edsMaxPodUnavailable,
+			SlowStartAdditiveIncrease:           opts.edsSlowStartAdditiveIncrease,
 			CanaryDuration:                      opts.edsCanaryDuration,
 			CanaryReplicas:                      opts.edsCanaryReplicas,
 			CanaryAutoPauseEnabled:              opts.edsCanaryAutoPauseEnabled,
 
@@ -562,7 +562,7 @@ spec:
               type: object
           type: object
       served: true
-      storage: true
+      storage: false
       subresources:
         status: {}
     - additionalPrinterColumns:
@@ -819,6 +819,32 @@ spec:
                   required:
                     - maxReplicas
                   type: object
+                fallback:
+                  default: {}
+                  description: Fallback defines how recommendations should be applied when in fallback mode.
+                  properties:
+                    horizontal:
+                      default: {}
+                      description: Horizontal configures the behavior during horizontal fallback mode.
+                      properties:
+                        enabled:
+                          default: true
+                          description: 'Enabled determines whether recommendations should be applied by the controller:'
+                          type: boolean
+                        triggers:
+                          default: {}
+                          description: Triggers defines the triggers that will generate recommendations.
+                          properties:
+                            staleRecommendationThresholdSeconds:
+                              default: 600
+                              description: StaleRecommendationThresholdSeconds defines the time window the controller will wait after detecting an error before applying recommendations.
+                              format: int32
+                              maximum: 1200
+                              minimum: 100
+                              type: integer
+                          type: object
+                      type: object
+                  type: object
                 objectives:
                   description: |-
                     Objectives are the objectives to reach and maintain for the target resource.
@@ -1110,6 +1136,6 @@ spec:
               type: object
           type: object
       served: true
-      storage: false
+      storage: true
       subresources:
         status: {}
@@ -279,6 +279,43 @@
           ],
           "type": "object"
         },
+        "fallback": {
+          "additionalProperties": false,
+          "default": {},
+          "description": "Fallback defines how recommendations should be applied when in fallback mode.",
+          "properties": {
+            "horizontal": {
+              "additionalProperties": false,
+              "default": {},
+              "description": "Horizontal configures the behavior during horizontal fallback mode.",
+              "properties": {
+                "enabled": {
+                  "default": true,
+                  "description": "Enabled determines whether recommendations should be applied by the controller:",
+                  "type": "boolean"
+                },
+                "triggers": {
+                  "additionalProperties": false,
+                  "default": {},
+                  "description": "Triggers defines the triggers that will generate recommendations.",
+                  "properties": {
+                    "staleRecommendationThresholdSeconds": {
+                      "default": 600,
+                      "description": "StaleRecommendationThresholdSeconds defines the time window the controller will wait after detecting an error before applying recommendations.",
+                      "format": "int32",
+                      "maximum": 1200,
+                      "minimum": 100,
+                      "type": "integer"
+                    }
+                  },
+                  "type": "object"
+                }
+              },
+              "type": "object"
+            }
+          },
+          "type": "object"
+        },
         "objectives": {
           "description": "Objectives are the objectives to reach and maintain for the target resource.\nDefault to a single objective to maintain 80% POD CPU utilization.",
           "items": {
 
@@ -1,5 +1,5 @@
 {
-  description": "DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API",
+  "description": "DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API",
   "properties": {
     "apiVersion": {
       "description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,9 @@ const (`
`264`	`264`
`265`	`265`	`// DatadogPodAutoscalerLocalValueSource is a recommendation that comes from the local fallback.`
`266`	`266`	`DatadogPodAutoscalerLocalValueSource DatadogPodAutoscalerValueSource = "Local"`
	`267`	`+`
	`268`	`+ // DatadogPodAutoscalerExternalValueSource is a recommendation that comes from an external source.`
	`269`	`+ DatadogPodAutoscalerExternalValueSource DatadogPodAutoscalerValueSource = "External"`
`267`	`270`	`)`
`268`	`271`
`269`	`272`	`// DatadogPodAutoscalerHorizontalStatus defines the status of the horizontal scaling`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- description": "DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API",`
	`2`	`+ "description": "DatadogPodAutoscaler is the Schema for the datadogpodautoscalers API",`
`3`	`3`	`"properties": {`
`4`	`4`	`"apiVersion": {`
`5`	`5`	`"description": "APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",`