⚠️ (Partially) fix upgrade behaviour in Extension
#759
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
do-not-merge/work-in-progress
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
m1kola
commented
Apr 17, 2024
| @@ -204,7 +204,7 @@ func TestExtensionResolve(t *testing.T) { | |||
| extNN := types.NamespacedName{Name: ext.GetName(), Namespace: ext.GetNamespace()} | |||
|
|
|||
| res, reconcileErr := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extNN}) | |||
| assert.Equal(t, reconcileErr, tc.wantErr) | |||
| assert.Equal(t, tc.wantErr, reconcileErr) | |||
There was a problem hiding this comment.
Should be expected and then actual.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #759 +/- ##
==========================================
- Coverage 68.15% 67.90% -0.26%
==========================================
Files 22 22
Lines 1429 1424 -5
==========================================
- Hits 974 967 -7
- Misses 390 391 +1
- Partials 65 66 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
m1kola
changed the title
HigherBundleVersion predicateExtension
* `HigherBundleVersion` allows upgrades which are not allowed in `ClusterExtension`. For example, it is possible to ugprade `Extension` from one major version to another. * Existing `InMastermindsSemverRange` can be used instead reducing the amount of code to maintain a bit. Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
m1kola
force-pushed
the
remove_HigherBundleVersion_predicate
branch
from
00afa62
to
d73541f
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
Merged
via the queue into
operator-framework:main
with commit Apr 17, 2024
e079129
15 of 17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
With the current code there are a few issues:
catalogfilter.HigherBundleVersionis not really required as we already have more genericcatalogfilter.InMastermindsSemverRange.catalogfilter.HigherBundleVersionallows upgrades from one major version to another major version, etc. This is not the same behaviour as inClusterExtensionreplaceshere.This PR solves the first two, but the third still needs to be addressed.
How it currently works in
ClusterExtension: https://github.com/operator-framework/operator-controller/blob/52cb7eb1a650731f2e16253a7f0f0ba25ea3af70/docs/drafts/upgrade-support.mdReviewer Checklist