Skip to content

[cluster autoscaling] initial commit for controller #42171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dd-mergequeue merged 21 commits into from
Nov 28, 2025
Merged

[cluster autoscaling] initial commit for controller #42171

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
eae5682
[cluster autoscaling] initial commit for controller
celenechang Oct 20, 2025
e9e0970
add unit tests
celenechang Oct 21, 2025
d11ab9b
updates following review
celenechang Oct 22, 2025
2be1a72
merge main
celenechang Oct 23, 2025
7b4b0d8
add reno
celenechang Oct 23, 2025
118475d
fix import
celenechang Oct 23, 2025
21ab7ad
dda inv tidy
celenechang Oct 23, 2025
30e7ac1
Revert "dda inv tidy"
celenechang Oct 23, 2025
ef9d9da
updates following review
celenechang Nov 12, 2025
a3a103e
merge main
celenechang Nov 12, 2025
cd4a314
cleanup
celenechang Nov 12, 2025
6380a34
update labels, collect new label as tag
celenechang Nov 24, 2025
b11ba4c
update nodepool label logic
celenechang Nov 25, 2025
069b443
incorporate target weight check
celenechang Nov 27, 2025
ad1c523
Merge remote-tracking branch 'origin/main' into celene/cluster_autosc…
vboulineau Nov 27, 2025
1d55eaf
Avoid alpha deps from Karpenter
vboulineau Nov 27, 2025
accce55
Move to more generic kube_cluster_autoscler tag
vboulineau Nov 27, 2025
ded9d69
Tidy and licenses
vboulineau Nov 27, 2025
45fcd1a
Apply suggestions from code review
vboulineau Nov 27, 2025
7844a07
Fix tests and review comments
vboulineau Nov 27, 2025
6c18314
Fix linter
vboulineau Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions LICENSE-3rdparty.csv
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion cmd/cluster-agent/subcommands/start/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/clusteragent/admission/mutate/autoinstrumentation"
admissionpatch "github.com/DataDog/datadog-agent/pkg/clusteragent/admission/patch"
apidca "github.com/DataDog/datadog-agent/pkg/clusteragent/api"
"github.com/DataDog/datadog-agent/pkg/clusteragent/autoscaling/cluster"
"github.com/DataDog/datadog-agent/pkg/clusteragent/autoscaling/workload"
"github.com/DataDog/datadog-agent/pkg/clusteragent/autoscaling/workload/provider"
pkgclusterchecks "github.com/DataDog/datadog-agent/pkg/clusteragent/clusterchecks"
Expand Down Expand Up @@ -392,7 +393,7 @@ func start(log log.Component,
pkglog.Errorf("Failed to generate or retrieve the cluster ID, err: %v", err)
}
if clusterName == "" {
if config.GetBool("autoscaling.workload.enabled") {
if config.GetBool("autoscaling.workload.enabled") || config.GetBool("autoscaling.cluster.enabled") {
return fmt.Errorf("Failed to start: autoscaling is enabled but no cluster name detected, exiting")
}
pkglog.Warn("Failed to auto-detect a Kubernetes cluster name. We recommend you set it manually via the cluster_name config option")
Expand All @@ -413,6 +414,9 @@ func start(log log.Component,
if config.GetBool("autoscaling.workload.enabled") {
products = append(products, state.ProductContainerAutoscalingSettings, state.ProductContainerAutoscalingValues)
}
if config.GetBool("autoscaling.cluster.enabled") {
products = append(products, state.ProductClusterAutoscalingValues)
}
if config.GetBool("admission_controller.auto_instrumentation.enabled") || config.GetBool("apm_config.instrumentation.enabled") {
products = append(products, state.ProductGradualRollout)
}
Expand Down Expand Up @@ -496,6 +500,16 @@ func start(log log.Component,
}
}

if config.GetBool("autoscaling.cluster.enabled") {
Comment thread
jennchenn marked this conversation as resolved.
if rcClient == nil {
return fmt.Errorf("Remote config is disabled or failed to initialize, remote config is a required dependency for autoscaling")
Comment thread
vboulineau marked this conversation as resolved.
Outdated
}

if err := cluster.StartClusterAutoscaling(mainCtx, clusterID, clusterName, le.IsLeader, apiCl, rcClient, demultiplexer); err != nil {
return fmt.Errorf("Error while starting cluster autoscaling: %v", err)
Comment thread
vboulineau marked this conversation as resolved.
Outdated
}
}

// Compliance
if config.GetBool("compliance_config.enabled") {
wg.Add(1)
Expand Down
8 changes: 4 additions & 4 deletions comp/otelcol/collector-contrib/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect
Expand Down Expand Up @@ -509,9 +509,9 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.2 // indirect
k8s.io/api v0.34.1 // indirect
k8s.io/apimachinery v0.34.1 // indirect
k8s.io/client-go v0.34.1 // indirect
k8s.io/api v0.35.0-alpha.0 // indirect
k8s.io/apimachinery v0.35.0-alpha.0 // indirect
k8s.io/client-go v0.35.0-alpha.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
Expand Down
16 changes: 8 additions & 8 deletions comp/otelcol/collector-contrib/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions comp/otelcol/ddflareextension/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect
Expand Down Expand Up @@ -494,9 +494,9 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.2 // indirect
k8s.io/api v0.34.1 // indirect
k8s.io/apimachinery v0.34.1 // indirect
k8s.io/client-go v0.34.1 // indirect
k8s.io/api v0.35.0-alpha.0 // indirect
k8s.io/apimachinery v0.35.0-alpha.0 // indirect
k8s.io/client-go v0.35.0-alpha.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
Expand Down
16 changes: 8 additions & 8 deletions comp/otelcol/ddflareextension/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions comp/otelcol/ddprofilingextension/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.34.1 // indirect
k8s.io/apimachinery v0.34.1 // indirect
k8s.io/client-go v0.34.1 // indirect
k8s.io/api v0.35.0-alpha.0 // indirect
k8s.io/apimachinery v0.35.0-alpha.0 // indirect
k8s.io/client-go v0.35.0-alpha.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
Expand Down
12 changes: 6 additions & 6 deletions comp/otelcol/ddprofilingextension/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.0
require github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.64.0-rc.3

require (
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.64.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.64.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/logsagentpipeline/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
)

require (
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/api/api/def v0.72.0-rc.1 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.64.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.72.0-rc.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
require go.yaml.in/yaml/v2 v2.4.3 // indirect

require (
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect
Expand Down
8 changes: 4 additions & 4 deletions comp/otelcol/otlp/components/exporter/datadogexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/lo
go 1.24.0

require (
github.com/DataDog/agent-payload/v5 v5.0.176
github.com/DataDog/agent-payload/v5 v5.0.177
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.73.0-devel.0.20251030121902-cd89eab046d6
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.73.0-rc.5
github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.73.0-rc.5
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/exporter/serializerexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ require (
)

require (
github.com/DataDog/agent-payload/v5 v5.0.176 // indirect
github.com/DataDog/agent-payload/v5 v5.0.177 // indirect
github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.73.0-rc.5 // indirect
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/otlp/components/exporter/serializerexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading