Skip to content

[autoscaling] HPA migration controller for DPA workload autoscaler #50210

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

Draft
clamoriniere wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[autoscaling] HPA migration controller for DPA workload autoscaler #50210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a607a3
[autoscaling] Add HPA migration controller for DPA workload autoscaler
clamoriniere Apr 30, 2026
c068b14
[autoscaling] Fix gofmt violation in controller_fake.go
clamoriniere May 1, 2026
79ae686
[autoscaling] Fix HPA admission webhook: apiVersions and annotation-c…
clamoriniere May 5, 2026
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
4 changes: 4 additions & 0 deletions pkg/clusteragent/admission/controllers/webhook/controller_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ func (c *controllerBase) generateWebhooks(datadogConfig config.Component, wmeta
autoscalingWebhook := autoscaling.NewWebhook(pp, datadogConfig)
webhooks = append(webhooks, autoscalingWebhook)

// Setup HPA migration webhook (protects HPAs neutralised by a DatadogPodAutoscaler).
hpaWebhook := autoscaling.NewHPAWebhook(datadogConfig)
webhooks = append(webhooks, hpaWebhook)

// Setup spot scheduling webhook.
spotWebhook := admspot.NewWebhook(datadogConfig, sh)
webhooks = append(webhooks, spotWebhook)
Expand Down
27 changes: 23 additions & 4 deletions pkg/clusteragent/admission/controllers/webhook/controller_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,22 @@ func (c *ControllerV1) deleteMutatingWebhook(webhook *admiv1.MutatingWebhookConf
return err
}

// webhookWithResourceAPIVersions is an optional interface that webhooks implement
// when they target resources at a non-default API version (i.e. not "v1").
// Webhooks that do not implement this interface default to apiVersions: ["v1"].
type webhookWithResourceAPIVersions interface {
ResourceAPIVersions() []string
}

// resourceAPIVersions returns the API versions a webhook targets.
// Falls back to ["v1"] when the webhook does not implement webhookWithResourceAPIVersions.
func resourceAPIVersions(w Webhook) []string {
if wh, ok := w.(webhookWithResourceAPIVersions); ok {
return wh.ResourceAPIVersions()
}
return []string{"v1"}
}

// generateTemplates generates the webhook templates from the configuration.
func (c *ControllerV1) generateTemplates() {
// Generate validating webhook templates
Expand All @@ -368,6 +384,7 @@ func (c *ControllerV1) generateTemplates() {
webhook.Endpoint(),
webhook.Operations(),
webhook.Resources(),
resourceAPIVersions(webhook),
nsSelector,
objSelector,
webhook.MatchConditions(),
Expand All @@ -391,6 +408,7 @@ func (c *ControllerV1) generateTemplates() {
webhook.Endpoint(),
webhook.Operations(),
webhook.Resources(),
resourceAPIVersions(webhook),
nsSelector,
objSelector,
webhook.MatchConditions(),
Expand All @@ -406,6 +424,7 @@ func (c *ControllerV1) generateTemplates() {
probeEndpoint,
[]admiv1.OperationType{admiv1.Create},
map[string][]string{"": {"configmaps"}},
[]string{"v1"},
&metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Expand All @@ -428,7 +447,7 @@ func (c *ControllerV1) generateTemplates() {
c.mutatingWebhookTemplates = mutatingWebhooks
}

func (c *ControllerV1) getValidatingWebhookSkeleton(nameSuffix, path string, operations []admiv1.OperationType, resourcesMap map[string][]string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1.MatchCondition, timeout int32) admiv1.ValidatingWebhook {
func (c *ControllerV1) getValidatingWebhookSkeleton(nameSuffix, path string, operations []admiv1.OperationType, resourcesMap map[string][]string, apiVersions []string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1.MatchCondition, timeout int32) admiv1.ValidatingWebhook {
matchPolicy := admiv1.Exact
sideEffects := admiv1.SideEffectClassNone
port := c.config.getServicePort()
Expand Down Expand Up @@ -463,7 +482,7 @@ func (c *ControllerV1) getValidatingWebhookSkeleton(nameSuffix, path string, ope
Operations: operations,
Rule: admiv1.Rule{
APIGroups: []string{group},
APIVersions: []string{"v1"},
APIVersions: apiVersions,
Resources: []string{resource},
},
})
Expand All @@ -473,7 +492,7 @@ func (c *ControllerV1) getValidatingWebhookSkeleton(nameSuffix, path string, ope
return webhook
}

func (c *ControllerV1) getMutatingWebhookSkeleton(nameSuffix, path string, operations []admiv1.OperationType, resourcesMap map[string][]string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1.MatchCondition, timeout int32) admiv1.MutatingWebhook {
func (c *ControllerV1) getMutatingWebhookSkeleton(nameSuffix, path string, operations []admiv1.OperationType, resourcesMap map[string][]string, apiVersions []string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1.MatchCondition, timeout int32) admiv1.MutatingWebhook {
matchPolicy := admiv1.Exact
sideEffects := admiv1.SideEffectClassNone
port := c.config.getServicePort()
Expand Down Expand Up @@ -510,7 +529,7 @@ func (c *ControllerV1) getMutatingWebhookSkeleton(nameSuffix, path string, opera
Operations: operations,
Rule: admiv1.Rule{
APIGroups: []string{group},
APIVersions: []string{"v1"},
APIVersions: apiVersions,
Resources: []string{resource},
},
})
Expand Down
14 changes: 7 additions & 7 deletions pkg/clusteragent/admission/controllers/webhook/controller_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,19 +182,19 @@ func TestAdmissionControllerFailureModeV1(t *testing.T) {
mockConfig.SetWithoutSource("admission_controller.failure_policy", value)
c.config = NewConfig(true, false, false, mockConfig)

validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1.Ignore, *validatingWebhookSkeleton.FailurePolicy)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1.Ignore, *mutatingWebhookSkeleton.FailurePolicy)
}

for _, value := range []string{"Fail", "fail"} {
mockConfig.SetWithoutSource("admission_controller.failure_policy", value)
c.config = NewConfig(true, false, false, mockConfig)

validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1.Fail, *validatingWebhookSkeleton.FailurePolicy)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1.Fail, *mutatingWebhookSkeleton.FailurePolicy)
}
}
Expand All @@ -208,7 +208,7 @@ func TestAdmissionControllerReinvocationPolicyV1(t *testing.T) {
mockConfig.SetWithoutSource("admission_controller.reinvocationpolicy", value)
c.config = NewConfig(true, false, false, mockConfig)

mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1.IfNeededReinvocationPolicy, *mutatingWebhookSkeleton.ReinvocationPolicy)
}
}
Expand Down Expand Up @@ -1127,7 +1127,7 @@ func TestGetValidatingWebhookSkeletonV1(t *testing.T) {

nsSelector, objSelector := common.DefaultLabelSelectors(tt.namespaceSelector, common.LabelSelectorsConfig{})

assert.EqualValues(t, tt.want, c.getValidatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nsSelector, objSelector, nil, 0))
assert.EqualValues(t, tt.want, c.getValidatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nsSelector, objSelector, nil, 0))
})
}
}
Expand Down Expand Up @@ -1233,7 +1233,7 @@ func TestGetMutatingWebhookSkeletonV1(t *testing.T) {

nsSelector, objSelector := common.DefaultLabelSelectors(tt.namespaceSelector, common.LabelSelectorsConfig{})

assert.EqualValues(t, tt.want, c.getMutatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, nsSelector, objSelector, nil, 0))
assert.EqualValues(t, tt.want, c.getMutatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1.OperationType{admiv1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nsSelector, objSelector, nil, 0))
})
}
}
Expand Down
11 changes: 7 additions & 4 deletions pkg/clusteragent/admission/controllers/webhook/controller_v1beta1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ func (c *ControllerV1beta1) generateTemplates() {
webhook.Endpoint(),
webhook.Operations(),
webhook.Resources(),
resourceAPIVersions(webhook),
nsSelector,
objSelector,
convertMatchConditions(webhook.MatchConditions()),
Expand All @@ -394,6 +395,7 @@ func (c *ControllerV1beta1) generateTemplates() {
webhook.Endpoint(),
webhook.Operations(),
webhook.Resources(),
resourceAPIVersions(webhook),
nsSelector,
objSelector,
convertMatchConditions(webhook.MatchConditions()),
Expand All @@ -409,6 +411,7 @@ func (c *ControllerV1beta1) generateTemplates() {
probeEndpoint,
[]admiv1beta1.OperationType{admiv1beta1.Create},
map[string][]string{"": {"configmaps"}},
[]string{"v1"},
&metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Expand All @@ -431,7 +434,7 @@ func (c *ControllerV1beta1) generateTemplates() {
c.mutatingWebhookTemplates = mutatingWebhooks
}

func (c *ControllerV1beta1) getValidatingWebhookSkeleton(nameSuffix, path string, operations []admiv1beta1.OperationType, resourcesMap map[string][]string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1beta1.MatchCondition, timeout int32) admiv1beta1.ValidatingWebhook {
func (c *ControllerV1beta1) getValidatingWebhookSkeleton(nameSuffix, path string, operations []admiv1beta1.OperationType, resourcesMap map[string][]string, apiVersions []string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1beta1.MatchCondition, timeout int32) admiv1beta1.ValidatingWebhook {
matchPolicy := admiv1beta1.Exact
sideEffects := admiv1beta1.SideEffectClassNone
port := c.config.getServicePort()
Expand Down Expand Up @@ -466,7 +469,7 @@ func (c *ControllerV1beta1) getValidatingWebhookSkeleton(nameSuffix, path string
Operations: operations,
Rule: admiv1beta1.Rule{
APIGroups: []string{group},
APIVersions: []string{"v1"},
APIVersions: apiVersions,
Resources: []string{resource},
},
})
Expand All @@ -476,7 +479,7 @@ func (c *ControllerV1beta1) getValidatingWebhookSkeleton(nameSuffix, path string
return webhook
}

func (c *ControllerV1beta1) getMutatingWebhookSkeleton(nameSuffix, path string, operations []admiv1beta1.OperationType, resourcesMap map[string][]string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1beta1.MatchCondition, timeout int32) admiv1beta1.MutatingWebhook {
func (c *ControllerV1beta1) getMutatingWebhookSkeleton(nameSuffix, path string, operations []admiv1beta1.OperationType, resourcesMap map[string][]string, apiVersions []string, namespaceSelector, objectSelector *metav1.LabelSelector, matchConditions []admiv1beta1.MatchCondition, timeout int32) admiv1beta1.MutatingWebhook {
matchPolicy := admiv1beta1.Exact
sideEffects := admiv1beta1.SideEffectClassNone
port := c.config.getServicePort()
Expand Down Expand Up @@ -513,7 +516,7 @@ func (c *ControllerV1beta1) getMutatingWebhookSkeleton(nameSuffix, path string,
Operations: operations,
Rule: admiv1beta1.Rule{
APIGroups: []string{group},
APIVersions: []string{"v1"},
APIVersions: apiVersions,
Resources: []string{resource},
},
})
Expand Down
14 changes: 7 additions & 7 deletions pkg/clusteragent/admission/controllers/webhook/controller_v1beta1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,19 @@ func TestAdmissionControllerFailureModeV1beta1(t *testing.T) {
mockConfig.SetWithoutSource("admission_controller.failure_policy", value)
c.config = NewConfig(true, false, false, mockConfig)

validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1beta1.Ignore, *validatingWebhookSkeleton.FailurePolicy)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1beta1.Ignore, *mutatingWebhookSkeleton.FailurePolicy)
}

for _, value := range []string{"Fail", "fail"} {
mockConfig.SetWithoutSource("admission_controller.failure_policy", value)
c.config = NewConfig(true, false, false, mockConfig)

validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
validatingWebhookSkeleton := c.getValidatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1beta1.Fail, *validatingWebhookSkeleton.FailurePolicy)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1beta1.Fail, *mutatingWebhookSkeleton.FailurePolicy)
}
}
Expand All @@ -204,7 +204,7 @@ func TestAdmissionControllerReinvocationPolicyV1beta1(t *testing.T) {
mockConfig.SetWithoutSource("admission_controller.reinvocationpolicy", value)
c.config = NewConfig(true, false, false, mockConfig)

mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nil, nil, nil, 0)
mutatingWebhookSkeleton := c.getMutatingWebhookSkeleton("foo", "/bar", []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nil, nil, nil, 0)
assert.Equal(t, admiv1beta1.IfNeededReinvocationPolicy, *mutatingWebhookSkeleton.ReinvocationPolicy)
}
}
Expand Down Expand Up @@ -1121,7 +1121,7 @@ func TestGetValidatingWebhookSkeletonV1beta1(t *testing.T) {

nsSelector, objSelector := common.DefaultLabelSelectors(tt.namespaceSelector, common.LabelSelectorsConfig{})

assert.EqualValues(t, tt.want, c.getValidatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nsSelector, objSelector, nil, 0))
assert.EqualValues(t, tt.want, c.getValidatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nsSelector, objSelector, nil, 0))
})
}
}
Expand Down Expand Up @@ -1227,7 +1227,7 @@ func TestGetMutatingWebhookSkeletonV1beta1(t *testing.T) {

nsSelector, objSelector := common.DefaultLabelSelectors(tt.namespaceSelector, common.LabelSelectorsConfig{})

assert.EqualValues(t, tt.want, c.getMutatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, nsSelector, objSelector, nil, 0))
assert.EqualValues(t, tt.want, c.getMutatingWebhookSkeleton(tt.args.nameSuffix, tt.args.path, []admiv1beta1.OperationType{admiv1beta1.Create}, map[string][]string{"": {"pods"}}, []string{"v1"}, nsSelector, objSelector, nil, 0))
})
}
}
Expand Down
Loading
Loading