Skip to content

Commit

Permalink
Allow autoscaler targetCPUUtilization and TargetMemoryUtilization to …
Browse files Browse the repository at this point in the history
…be greater than 99 (#3260)
  • Loading branch information
davidhaja committed Sep 4, 2024
1 parent 7a8c9c8 commit ba2eba6
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 5 deletions.
16 changes: 16 additions & 0 deletions .chloggen/3258-autoscaler-utilization-greater-than-99.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
component: collector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Allow autoscaler targetCPUUtilization and TargetMemoryUtilization to be greater than 99"

# One or more tracking issues related to the change
issues: [3258]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
8 changes: 4 additions & 4 deletions apis/v1beta1/collector_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ func checkAutoscalerSpec(autoscaler *AutoscalerSpec) error {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, scaleUp should be one or more")
}
}
if autoscaler.TargetCPUUtilization != nil && (*autoscaler.TargetCPUUtilization < int32(1) || *autoscaler.TargetCPUUtilization > int32(99)) {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, targetCPUUtilization should be greater than 0 and less than 100")
if autoscaler.TargetCPUUtilization != nil && *autoscaler.TargetCPUUtilization < int32(1) {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, targetCPUUtilization should be greater than 0")
}
if autoscaler.TargetMemoryUtilization != nil && (*autoscaler.TargetMemoryUtilization < int32(1) || *autoscaler.TargetMemoryUtilization > int32(99)) {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, targetMemoryUtilization should be greater than 0 and less than 100")
if autoscaler.TargetMemoryUtilization != nil && *autoscaler.TargetMemoryUtilization < int32(1) {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, targetMemoryUtilization should be greater than 0")
}

for _, metric := range autoscaler.Metrics {
Expand Down
14 changes: 13 additions & 1 deletion apis/v1beta1/collector_webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,19 @@ func TestOTELColValidatingWebhook(t *testing.T) {
},
},
},
expectedErr: "targetCPUUtilization should be greater than 0 and less than 100",
expectedErr: "targetCPUUtilization should be greater than 0",
},
{
name: "invalid autoscaler target memory utilization",
otelcol: OpenTelemetryCollector{
Spec: OpenTelemetryCollectorSpec{
Autoscaler: &AutoscalerSpec{
MaxReplicas: &three,
TargetMemoryUtilization: &zero,
},
},
},
expectedErr: "targetMemoryUtilization should be greater than 0",
},
{
name: "autoscaler minReplicas is less than maxReplicas",
Expand Down

0 comments on commit ba2eba6

Please sign in to comment.