Skip to content

Commit 8802e54

Browse files
committed
topics: add and use operobsgen
report if the NUMAResourcesOperator object exposes the ObservedGeneration in status, so we can consume the value in the e2e tests and have more robust runs. Signed-off-by: Francesco Romani <fromani@redhat.com>
1 parent 72aa290 commit 8802e54

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

internal/api/features/_topics.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"nrtcrdanns",
2424
"netpols",
2525
"mgselinuxcollect",
26-
"tlscompliance"
26+
"tlscompliance",
27+
"operobsgen"
2728
]
2829
}

test/e2e/serial/tests/configuration.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"errors"
2323
"fmt"
2424
"reflect"
25+
"slices"
2526
"sort"
2627
"strconv"
2728
"strings"
@@ -1844,6 +1845,10 @@ func isNROOperSyncedAt(nropStatus *nropv1.NUMAResourcesOperatorStatus, condition
18441845
if cond.Status != metav1.ConditionTrue {
18451846
return errors.New("condition not true")
18461847
}
1848+
// TODO: until all the version reports ObservedGeneration
1849+
if serialconfig.Config != nil && !slices.Contains(serialconfig.Config.ClusterTopics.Active, "operobsgen") {
1850+
return nil
1851+
}
18471852
if cond.ObservedGeneration != gen {
18481853
return fmt.Errorf("condition at %d expected %d", cond.ObservedGeneration, gen)
18491854
}

0 commit comments

Comments
 (0)