Commit 8039855
Fix isNoOLMFeatureGateEnabled to check only the current cluster version
The FeatureGate CR status.featureGates contains entries for each
cluster version. After an upgrade, entries for both the old and new
versions exist. isNoOLMFeatureGateEnabled was iterating all version
entries, so it could incorrectly return true by finding the gate
enabled in a pre-upgrade version's entry, even though the current
version has it disabled. This caused the e2e-upgrade-out-of-change
test to fail because it expected a sail finalizer that the CIO
had already removed during the downgrade path.
Fix this by looking up the current cluster version from ClusterVersion
status.desired.version and only checking the matching featureGates
entry.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>1 parent a2cb43f commit 8039855
1 file changed
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
643 | 643 | | |
644 | 644 | | |
645 | 645 | | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
646 | 652 | | |
647 | 653 | | |
648 | 654 | | |
649 | 655 | | |
650 | 656 | | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
651 | 660 | | |
652 | 661 | | |
653 | | - | |
| 662 | + | |
654 | 663 | | |
655 | 664 | | |
656 | 665 | | |
657 | 666 | | |
| 667 | + | |
658 | 668 | | |
659 | 669 | | |
660 | 670 | | |
| |||
0 commit comments