diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go
index 1c9382fe21..197162ac47 100644
--- a/apis/v1alpha1/opentelemetrycollector_types.go
+++ b/apis/v1alpha1/opentelemetrycollector_types.go
@@ -41,13 +41,11 @@ type OpenTelemetryCollectorSpec struct {
// MaxReplicas sets an upper bound to the autoscaling feature. If MaxReplicas is set autoscaling is enabled.
// +optional
MaxReplicas *int32 `json:"maxReplicas,omitempty"`
-
// Autoscaler specifies the pod autoscaling configuration to use
// for the OpenTelemetryCollector workload.
//
// +optional
Autoscaler *AutoscalerSpec `json:"autoscaler,omitempty"`
-
// SecurityContext will be set as the container security context.
// +optional
SecurityContext *v1.SecurityContext `json:"securityContext,omitempty"`
@@ -216,6 +214,10 @@ type OpenTelemetryCollectorList struct {
type AutoscalerSpec struct {
// +optional
Behavior *autoscalingv2.HorizontalPodAutoscalerBehavior `json:"behavior,omitempty"`
+ // TargetCPUUtilization sets the target average CPU used across all replicas.
+ // If average CPU exceeds this value, the HPA will scale up. Defaults to 90 percent.
+ // +optional
+ TargetCPUUtilization *int32 `json:"targetCPUUtilization,omitempty"`
}
func init() {
diff --git a/apis/v1alpha1/opentelemetrycollector_webhook.go b/apis/v1alpha1/opentelemetrycollector_webhook.go
index 39e5f617df..78e9719628 100644
--- a/apis/v1alpha1/opentelemetrycollector_webhook.go
+++ b/apis/v1alpha1/opentelemetrycollector_webhook.go
@@ -65,6 +65,12 @@ func (r *OpenTelemetryCollector) Default() {
if r.Spec.TargetAllocator.Enabled && r.Spec.TargetAllocator.Replicas == nil {
r.Spec.TargetAllocator.Replicas = &one
}
+
+ // Set default targetCPUUtilization for autoscaler
+ if r.Spec.MaxReplicas != nil && r.Spec.Autoscaler.TargetCPUUtilization == nil {
+ defaultCPUTarget := int32(90)
+ r.Spec.Autoscaler.TargetCPUUtilization = &defaultCPUTarget
+ }
}
// +kubebuilder:webhook:verbs=create;update,path=/validate-opentelemetry-io-v1alpha1-opentelemetrycollector,mutating=false,failurePolicy=fail,groups=opentelemetry.io,resources=opentelemetrycollectors,versions=v1alpha1,name=vopentelemetrycollectorcreateupdate.kb.io,sideEffects=none,admissionReviewVersions=v1
@@ -141,6 +147,10 @@ func (r *OpenTelemetryCollector) validateCRDSpec() error {
return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, scaleUp should be one or more")
}
}
+ if r.Spec.Autoscaler.TargetCPUUtilization != nil && (*r.Spec.Autoscaler.TargetCPUUtilization < int32(1) || *r.Spec.Autoscaler.TargetCPUUtilization > int32(99)) {
+ return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, targetCPUUtilization should be greater than 0 and less than 100")
+ }
+
}
return nil
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
index f2b8397930..e41120b723 100644
--- a/apis/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/v1alpha1/zz_generated.deepcopy.go
@@ -539,4 +539,4 @@ func (in *ScaleSubresourceStatus) DeepCopy() *ScaleSubresourceStatus {
out := new(ScaleSubresourceStatus)
in.DeepCopyInto(out)
return out
-}
+}
\ No newline at end of file
diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
index 1572235e13..c1e4aa95ae 100644
--- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -182,6 +182,12 @@ spec:
type: integer
type: object
type: object
+ targetCPUUtilization:
+ description: TargetCPUUtilization sets the target average CPU
+ used across all replicas. If average CPU exceeds this value,
+ the HPA will scale up. Defaults to 90 percent.
+ format: int32
+ type: integer
type: object
config:
description: Config is the raw JSON to be used as the collector's
diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
index 27e6e0180e..291ce4177e 100644
--- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -180,6 +180,12 @@ spec:
type: integer
type: object
type: object
+ targetCPUUtilization:
+ description: TargetCPUUtilization sets the target average CPU
+ used across all replicas. If average CPU exceeds this value,
+ the HPA will scale up. Defaults to 90 percent.
+ format: int32
+ type: integer
type: object
config:
description: Config is the raw JSON to be used as the collector's
diff --git a/docs/api.md b/docs/api.md
index dac36db06f..cfcf113717 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -1896,6 +1896,15 @@ Autoscaler specifies the pod autoscaling configuration to use for the OpenTeleme
HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).
false |
+
+ | targetCPUUtilization |
+ integer |
+
+ TargetCPUUtilization sets the target average CPU used across all replicas. If average CPU exceeds this value, the HPA will scale up. Defaults to 90 percent.
+
+ Format: int32
+ |
+ false |
diff --git a/pkg/collector/horizontalpodautoscaler.go b/pkg/collector/horizontalpodautoscaler.go
index 25265a3d70..8fc133ab1b 100644
--- a/pkg/collector/horizontalpodautoscaler.go
+++ b/pkg/collector/horizontalpodautoscaler.go
@@ -28,8 +28,6 @@ import (
"github.com/open-telemetry/opentelemetry-operator/pkg/naming"
)
-const defaultCPUTarget int32 = 90
-
func HorizontalPodAutoscaler(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelemetryCollector) client.Object {
autoscalingVersion := cfg.AutoscalingVersion()
@@ -37,7 +35,7 @@ func HorizontalPodAutoscaler(cfg config.Config, logger logr.Logger, otelcol v1al
labels["app.kubernetes.io/name"] = naming.Collector(otelcol)
annotations := Annotations(otelcol)
- cpuTarget := defaultCPUTarget
+
var result client.Object
objectMeta := metav1.ObjectMeta{
@@ -54,7 +52,7 @@ func HorizontalPodAutoscaler(cfg config.Config, logger logr.Logger, otelcol v1al
Name: corev1.ResourceCPU,
Target: autoscalingv2beta2.MetricTarget{
Type: autoscalingv2beta2.UtilizationMetricType,
- AverageUtilization: &cpuTarget,
+ AverageUtilization: otelcol.Spec.Autoscaler.TargetCPUUtilization,
},
},
}
@@ -87,7 +85,7 @@ func HorizontalPodAutoscaler(cfg config.Config, logger logr.Logger, otelcol v1al
Name: corev1.ResourceCPU,
Target: autoscalingv2.MetricTarget{
Type: autoscalingv2.UtilizationMetricType,
- AverageUtilization: &cpuTarget,
+ AverageUtilization: otelcol.Spec.Autoscaler.TargetCPUUtilization,
},
},
}
diff --git a/pkg/collector/horizontalpodautoscaler_test.go b/pkg/collector/horizontalpodautoscaler_test.go
index c8f076248b..04b90b3480 100644
--- a/pkg/collector/horizontalpodautoscaler_test.go
+++ b/pkg/collector/horizontalpodautoscaler_test.go
@@ -41,6 +41,7 @@ func TestHPA(t *testing.T) {
var minReplicas int32 = 3
var maxReplicas int32 = 5
+ var cpuUtilization int32 = 90
otelcol := v1alpha1.OpenTelemetryCollector{
ObjectMeta: metav1.ObjectMeta{
@@ -49,6 +50,9 @@ func TestHPA(t *testing.T) {
Spec: v1alpha1.OpenTelemetryCollectorSpec{
Replicas: &minReplicas,
MaxReplicas: &maxReplicas,
+ Autoscaler: &v1alpha1.AutoscalerSpec{
+ TargetCPUUtilization: &cpuUtilization,
+ },
},
}
diff --git a/pkg/collector/reconcile/horizontalpodautoscaler.go b/pkg/collector/reconcile/horizontalpodautoscaler.go
index 302f3c4a5a..1f8435ff11 100644
--- a/pkg/collector/reconcile/horizontalpodautoscaler.go
+++ b/pkg/collector/reconcile/horizontalpodautoscaler.go
@@ -119,6 +119,7 @@ func setAutoscalerSpec(params Params, autoscalingVersion autodetect.AutoscalingV
} else {
updated.(*autoscalingv2beta2.HorizontalPodAutoscaler).Spec.MinReplicas = &one
}
+ updated.(*autoscalingv2beta2.HorizontalPodAutoscaler).Spec.Metrics[0].Resource.Target.AverageUtilization = params.Instance.Spec.Autoscaler.TargetCPUUtilization
} else {
updated.(*autoscalingv2.HorizontalPodAutoscaler).Spec.MaxReplicas = *params.Instance.Spec.MaxReplicas
if params.Instance.Spec.MinReplicas != nil {
@@ -126,6 +127,7 @@ func setAutoscalerSpec(params Params, autoscalingVersion autodetect.AutoscalingV
} else {
updated.(*autoscalingv2.HorizontalPodAutoscaler).Spec.MinReplicas = &one
}
+ updated.(*autoscalingv2.HorizontalPodAutoscaler).Spec.Metrics[0].Resource.Target.AverageUtilization = params.Instance.Spec.Autoscaler.TargetCPUUtilization
}
}
}
diff --git a/pkg/collector/reconcile/horizontalpodautoscaler_test.go b/pkg/collector/reconcile/horizontalpodautoscaler_test.go
index 13cfe1a37f..3d23f29c70 100644
--- a/pkg/collector/reconcile/horizontalpodautoscaler_test.go
+++ b/pkg/collector/reconcile/horizontalpodautoscaler_test.go
@@ -109,6 +109,7 @@ func paramsWithHPA(autoscalingVersion autodetect.AutoscalingVersion) Params {
minReplicas := int32(3)
maxReplicas := int32(5)
+ cpuUtilization := int32(90)
mockAutoDetector := &mockAutoDetect{
HPAVersionFunc: func() (autodetect.AutoscalingVersion, error) {
@@ -147,6 +148,9 @@ func paramsWithHPA(autoscalingVersion autodetect.AutoscalingVersion) Params {
Config: string(configYAML),
Replicas: &minReplicas,
MaxReplicas: &maxReplicas,
+ Autoscaler: &v1alpha1.AutoscalerSpec{
+ TargetCPUUtilization: &cpuUtilization,
+ },
},
},
Scheme: testScheme,
diff --git a/tests/e2e/autoscale/00-assert.yaml b/tests/e2e/autoscale/00-assert.yaml
index aaacc816cd..4039af39fb 100644
--- a/tests/e2e/autoscale/00-assert.yaml
+++ b/tests/e2e/autoscale/00-assert.yaml
@@ -4,7 +4,6 @@ metadata:
name: simplest-collector
status:
readyReplicas: 1
-
---
apiVersion: autoscaling/v1
kind: HorizontalPodAutoscaler
@@ -16,4 +15,18 @@ spec:
# This is not neccesarily exact. We really just want to wait until this is no longer
status:
currentCPUUtilizationPercentage: 20
-
+---
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: simplest-set-utilization-collector
+spec:
+ minReplicas: 1
+ maxReplicas: 2
+ metrics:
+ - type: Resource
+ resource:
+ name: cpu
+ target:
+ type: Utilization
+ averageUtilization: 50
\ No newline at end of file
diff --git a/tests/e2e/autoscale/00-install.yaml b/tests/e2e/autoscale/00-install.yaml
index 8645bb919a..04e52e7be9 100644
--- a/tests/e2e/autoscale/00-install.yaml
+++ b/tests/e2e/autoscale/00-install.yaml
@@ -36,3 +36,38 @@ spec:
receivers: [otlp]
processors: []
exporters: [logging]
+---
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+ name: simplest-set-utilization
+spec:
+ minReplicas: 1
+ maxReplicas: 2
+ autoscaler:
+ targetCPUUtilization: 50
+ resources:
+ limits:
+ cpu: 500m
+ memory: 128Mi
+ requests:
+ cpu: 5m
+ memory: 64Mi
+
+ config: |
+ receivers:
+ otlp:
+ protocols:
+ grpc:
+ http:
+ processors:
+
+ exporters:
+ logging:
+
+ service:
+ pipelines:
+ traces:
+ receivers: [otlp]
+ processors: []
+ exporters: [logging]