Fix CSV for 1.5.3 #401
Merged
Fix CSV for 1.5.3 #401
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
This is now mandated by CVP if the CSV uses the `skipRange` field. Fixes: KATA-2894 Fixes: KATA-2876 Signed-off-by: Greg Kurz <groug@kaod.org> (cherry picked from commit 696aef2, fixed version for 1.5.3) Signed-off-by: Greg Kurz <groug@kaod.org>
The `features.operators.openshift.io` infrastructure feature annotations, introduced in OpenShift Container Platform 4.14, deprecate the `operators.openshift.io/infrastructure-features` annotations used in earlier versions of OpenShift Container Platform. See [1] Drop the `operators.openshift.io/infrastructure-features` line. [1] https://docs.openshift.com/container-platform/4.14/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-manual-annotations-deprecated_osdk-generating-csvs Fixes: KATA-2895 Fixes: KATA-2876 Signed-off-by: Cameron Meadors <cmeadors@redhat.com> Signed-off-by: Greg Kurz <groug@kaod.org> (cherry picked from commit 0208616, fixed trivial context conflict) Signed-off-by: Greg Kurz <groug@kaod.org>
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Make it a draft until we know if https://issues.redhat.com/browse/KATA-2523 calls for an extra change. |
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
bpradipt
approved these changes
Apr 10, 2024
littlejawa
approved these changes
Apr 10, 2024
There was a problem hiding this comment.
lgtm
Compared with the changes from referenced PRs, and consistent with the content we expect in a 1.5.3 release.
Thanks @gkurz
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 of the problem which is fixed/What is the use case
This brings changes of #398 and #399 to 1.5.3.
Fixes: KATA-2876
- What I did
git cherry-pick -sx 696aef2b492a1f3ab78b33c1a365b904dac80e51and adpated version to 1.5.3git cherry-pick -sx 02086163095a8e97df209f3bbbd3d5d8293842e2and fixed a trivial context conflict- How to verify it
operators.openshift.io/infrastructure-featurestofeatures.operators.openshift.ioreplaces: sandboxed-containers-operator.v1.5.2required byolm.skipRange: '>=1.1.0 <1.5.3'