From 5b3deaea4450c4df3e84701200086395e29bfbcb Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Tue, 30 Jan 2024 15:13:23 -0500 Subject: [PATCH 1/2] begin fix --- .../watcher/promOperator_test.go | 2 +- tests/e2e-autoscale/autoscale/00-install.yaml | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmd/otel-allocator/watcher/promOperator_test.go b/cmd/otel-allocator/watcher/promOperator_test.go index d1fd622c61..37c651d73d 100644 --- a/cmd/otel-allocator/watcher/promOperator_test.go +++ b/cmd/otel-allocator/watcher/promOperator_test.go @@ -920,7 +920,7 @@ func TestNamespaceLabelUpdate(t *testing.T) { default: return false } - }, eventInterval*5, time.Millisecond) + }, time.Second, time.Millisecond) } func TestRateLimit(t *testing.T) { diff --git a/tests/e2e-autoscale/autoscale/00-install.yaml b/tests/e2e-autoscale/autoscale/00-install.yaml index 8f5f5fa92d..b0048e0947 100644 --- a/tests/e2e-autoscale/autoscale/00-install.yaml +++ b/tests/e2e-autoscale/autoscale/00-install.yaml @@ -9,17 +9,17 @@ kind: OpenTelemetryCollector metadata: name: simplest spec: -# TODO: these tests use .Spec.MaxReplicas and .Spec.MinReplicas. These fields are -# deprecated and moved to .Spec.Autoscaler. Fine to use these fields to test that old CRD is -# still supported but should eventually be updated. - minReplicas: 1 - maxReplicas: 2 - autoscaler: - behavior: - scaleUp: - stabilizationWindowSeconds: 10 - scaleDown: - stabilizationWindowSeconds: 15 + # TODO: these tests use .Spec.MaxReplicas and .Spec.MinReplicas. These fields are + # deprecated and moved to .Spec.Autoscaler. Fine to use these fields to test that old CRD is + # still supported but should eventually be updated. + # minReplicas: 1 + # maxReplicas: 2 + # autoscaler: + # behavior: + # scaleUp: + # stabilizationWindowSeconds: 10 + # scaleDown: + # stabilizationWindowSeconds: 15 resources: limits: cpu: 500m @@ -51,13 +51,13 @@ kind: OpenTelemetryCollector metadata: name: simplest-set-utilization spec: - minReplicas: 1 - maxReplicas: 2 - autoscaler: - targetCPUUtilization: 99 - behavior: - scaleUp: - stabilizationWindowSeconds: 300 + # minReplicas: 1 + # maxReplicas: 2 + # autoscaler: + # targetCPUUtilization: 99 + # behavior: + # scaleUp: + # stabilizationWindowSeconds: 300 resources: limits: cpu: 250m From 06efe557c7ee9cc8695570bc10660d09c47daaa7 Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Thu, 1 Feb 2024 12:05:29 -0500 Subject: [PATCH 2/2] revert --- tests/e2e-autoscale/autoscale/00-install.yaml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/e2e-autoscale/autoscale/00-install.yaml b/tests/e2e-autoscale/autoscale/00-install.yaml index b0048e0947..8f5f5fa92d 100644 --- a/tests/e2e-autoscale/autoscale/00-install.yaml +++ b/tests/e2e-autoscale/autoscale/00-install.yaml @@ -9,17 +9,17 @@ kind: OpenTelemetryCollector metadata: name: simplest spec: - # TODO: these tests use .Spec.MaxReplicas and .Spec.MinReplicas. These fields are - # deprecated and moved to .Spec.Autoscaler. Fine to use these fields to test that old CRD is - # still supported but should eventually be updated. - # minReplicas: 1 - # maxReplicas: 2 - # autoscaler: - # behavior: - # scaleUp: - # stabilizationWindowSeconds: 10 - # scaleDown: - # stabilizationWindowSeconds: 15 +# TODO: these tests use .Spec.MaxReplicas and .Spec.MinReplicas. These fields are +# deprecated and moved to .Spec.Autoscaler. Fine to use these fields to test that old CRD is +# still supported but should eventually be updated. + minReplicas: 1 + maxReplicas: 2 + autoscaler: + behavior: + scaleUp: + stabilizationWindowSeconds: 10 + scaleDown: + stabilizationWindowSeconds: 15 resources: limits: cpu: 500m @@ -51,13 +51,13 @@ kind: OpenTelemetryCollector metadata: name: simplest-set-utilization spec: - # minReplicas: 1 - # maxReplicas: 2 - # autoscaler: - # targetCPUUtilization: 99 - # behavior: - # scaleUp: - # stabilizationWindowSeconds: 300 + minReplicas: 1 + maxReplicas: 2 + autoscaler: + targetCPUUtilization: 99 + behavior: + scaleUp: + stabilizationWindowSeconds: 300 resources: limits: cpu: 250m