Skip to content

Commit d0a60d5

Browse files
authored
Check for expected order of HPA metrics (#624)
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
1 parent 1d8c713 commit d0a60d5

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

cmd/e2e/generated_autoscaler_test.go

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77

88
"github.com/stretchr/testify/require"
99
zv1 "github.com/zalando-incubator/stackset-controller/pkg/apis/zalando.org/v1"
10-
v2 "k8s.io/api/autoscaling/v2"
1110
"k8s.io/apimachinery/pkg/api/resource"
1211
)
1312

@@ -56,25 +55,9 @@ func TestGenerateAutoscaler(t *testing.T) {
5655
require.EqualValues(t, 10, hpa.Spec.MaxReplicas)
5756
require.Len(t, hpa.Spec.Metrics, 3)
5857

59-
// we intentionally don't care about the order of the metrics because
60-
// it's not guaranteed in Kubernetes versions below v1.28
61-
// See https://github.com/zalando-incubator/stackset-controller/pull/591#issuecomment-1959751276
62-
metricTypes := map[v2.MetricSourceType]int64{
63-
v2.ExternalMetricSourceType: 10,
64-
v2.ResourceMetricSourceType: 50,
65-
v2.ObjectMetricSourceType: 20,
66-
}
67-
68-
for _, metric := range hpa.Spec.Metrics {
69-
switch metric.Type {
70-
case v2.ExternalMetricSourceType:
71-
require.EqualValues(t, metricTypes[metric.Type], metric.External.Target.AverageValue.Value())
72-
case v2.ResourceMetricSourceType:
73-
require.EqualValues(t, metricTypes[metric.Type], *metric.Resource.Target.AverageUtilization)
74-
case v2.ObjectMetricSourceType:
75-
require.EqualValues(t, metricTypes[metric.Type], metric.Object.Target.AverageValue.Value())
76-
}
77-
}
58+
require.EqualValues(t, 10, hpa.Spec.Metrics[0].External.Target.AverageValue.Value())
59+
require.EqualValues(t, 50, *hpa.Spec.Metrics[1].Resource.Target.AverageUtilization)
60+
require.EqualValues(t, 20, hpa.Spec.Metrics[2].Object.Target.AverageValue.Value())
7861
}
7962

8063
func TestAutoscalerWithoutTraffic(t *testing.T) {

0 commit comments

Comments
 (0)