Skip to content

Commit 70246ac

Browse files
fix: don't check f:image for PrometheusManagedFields (#1033)
1 parent cb8ba52 commit 70246ac

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

test/e2e/monitoring_stack_controller_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,11 +862,16 @@ func assertPrometheusManagedFields(t *testing.T) {
862862
s, err := json.MarshalIndent(oboManagedFields.FieldsV1, "", " ")
863863
assert.NilError(t, err)
864864

865-
var objmap map[string]interface{}
865+
var objmap map[string]map[string]interface{}
866866
err = json.Unmarshal(s, &objmap)
867867
assert.NilError(t, err)
868868
have := objmap["f:spec"]
869869

870+
// Remove optional managed fields to ensure stability across various e2e environments
871+
for _, optionalField := range oboOptionalManagedFields {
872+
delete(have, optionalField)
873+
}
874+
870875
var expected map[string]interface{}
871876
err = json.Unmarshal([]byte(oboManagedFieldsJson), &expected)
872877
assert.NilError(t, err)
@@ -1103,6 +1108,10 @@ const oboManagedFieldsJson = `
11031108
}
11041109
`
11051110

1111+
// When running tests in an environment where obo is passed the `--images=prometheus=...` flag
1112+
// the f:image managed field will be set on the Prometheus CR
1113+
var oboOptionalManagedFields = []string{"f:image"}
1114+
11061115
func getAlertmanagerAlerts() ([]alert, error) {
11071116
client := http.Client{}
11081117
resp, err := client.Get("http://localhost:9093/api/v2/alerts")

0 commit comments

Comments
 (0)