Skip to content

Commit 73c6488

Browse files
committed
Remove unnecessary UWM configuration in TestUserWorkloadMonitoringXXX since those
scenarios are already tested in TestUserWorkloadMonitorPrometheusK8Config. Additionally, these configurations may require UWM Prometheus Pods to restart during tests, as applying these configurations is asynchronous. This could disrupt the tests, make them harder to debug, and slow them down.
1 parent 032b198 commit 73c6488

File tree

1 file changed

+1
-46
lines changed

1 file changed

+1
-46
lines changed

test/e2e/user_workload_monitoring_test.go

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,6 @@ func TestUserWorkloadMonitoringInvalidConfig(t *testing.T) {
8585
func TestUserWorkloadMonitoringMetrics(t *testing.T) {
8686
setupUserWorkloadAssetsWithTeardownHook(t, f)
8787

88-
uwmCM := f.BuildUserWorkloadConfigMap(t,
89-
`prometheus:
90-
enforcedTargetLimit: 10
91-
volumeClaimTemplate:
92-
spec:
93-
resources:
94-
requests:
95-
storage: 2Gi
96-
`,
97-
)
98-
f.MustCreateOrUpdateConfigMap(t, uwmCM)
99-
defer f.MustDeleteConfigMap(t, uwmCM)
100-
10188
f.AssertStatefulSetExistsAndRollout("prometheus-user-workload", f.UserWorkloadMonitoringNs)(t)
10289
if err := deployUserApplication(f); err != nil {
10390
t.Fatal(err)
@@ -145,13 +132,7 @@ func TestUserWorkloadMonitoringAlerting(t *testing.T) {
145132
setupUserWorkloadAssetsWithTeardownHook(t, f)
146133

147134
uwmCM := f.BuildUserWorkloadConfigMap(t,
148-
fmt.Sprintf(`prometheus:
149-
enforcedTargetLimit: 10
150-
volumeClaimTemplate:
151-
spec:
152-
resources:
153-
requests:
154-
storage: 2Gi
135+
fmt.Sprintf(`
155136
namespacesWithoutLabelEnforcement:
156137
- %s
157138
`, notEnforcedNs),
@@ -217,19 +198,6 @@ userWorkload:
217198
func TestUserWorkloadMonitoringOptOut(t *testing.T) {
218199
setupUserWorkloadAssetsWithTeardownHook(t, f)
219200

220-
uwmCM := f.BuildUserWorkloadConfigMap(t,
221-
`prometheus:
222-
enforcedTargetLimit: 10
223-
volumeClaimTemplate:
224-
spec:
225-
resources:
226-
requests:
227-
storage: 2Gi
228-
`,
229-
)
230-
f.MustCreateOrUpdateConfigMap(t, uwmCM)
231-
defer f.MustDeleteConfigMap(t, uwmCM)
232-
233201
f.AssertStatefulSetExistsAndRollout("prometheus-user-workload", f.UserWorkloadMonitoringNs)(t)
234202
if err := deployUserApplication(f); err != nil {
235203
t.Fatal(err)
@@ -249,19 +217,6 @@ func TestUserWorkloadMonitoringOptOut(t *testing.T) {
249217
func TestUserWorkloadMonitoringGrpcSecrets(t *testing.T) {
250218
setupUserWorkloadAssetsWithTeardownHook(t, f)
251219

252-
uwmCM := f.BuildUserWorkloadConfigMap(t,
253-
`prometheus:
254-
enforcedTargetLimit: 10
255-
volumeClaimTemplate:
256-
spec:
257-
resources:
258-
requests:
259-
storage: 2Gi
260-
`,
261-
)
262-
f.MustCreateOrUpdateConfigMap(t, uwmCM)
263-
defer f.MustDeleteConfigMap(t, uwmCM)
264-
265220
for _, scenario := range []struct {
266221
name string
267222
f func(*testing.T)

0 commit comments

Comments
 (0)