Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KATA-2881: add new annotations to CSV #389

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

cpmeadors
Copy link
Contributor

@cpmeadors cpmeadors commented Apr 2, 2024

- Description of the problem which is fixed/What is the use case
CVP downstream requires new annotations to exist in the CSV. https://docs.openshift.com/container-platform/4.15/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-annotations-infra_osdk-generating-csvs

Closes: KATA-2881

- What I did
Added the annotations to CSV. I set disconnected to true and all the rest false. We can update them if that is wrong, but this should satisfy CVP.

- How to verify it
Make bundle. Check bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml to see if new annotations are in rendered CSV

- Description for the changelog

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 2, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 2, 2024

@cpmeadors: This pull request references KATA-2881 which is a valid jira issue.

In response to this:

- Description of the problem which is fixed/What is the use case
CVP downstream requires new annotations to exist in the CSV. https://docs.openshift.com/container-platform/4.15/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-annotations-infra_osdk-generating-csvs

Closes: KATA-2881

- What I did
Added the annotations to CSV. I set disconnected to true and all the rest false. We can update them if that is wrong, but this should satisfy CVP.

- How to verify it
Make bundle. Check bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml to see if new annotations are in rendered CSV

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from bpradipt and snir911 April 2, 2024 18:58
Copy link
Member

@beraldoleal beraldoleal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Copy link
Contributor

@bpradipt bpradipt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2024
@@ -13,6 +13,13 @@ metadata:
}
]
capabilities: Seamless Upgrades
features.operators.openshift.io/disconnected: "true"
features.operators.openshift.io/fips-compliant: "false"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this should be true given
operators.openshift.io/infrastructure-features: '["disconnected", "fips"]'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ProdSec invalidated our FIPS compliance by invalidating anything based On UBI builds. We must build on rhel-els base images for FIPS compliance now. I wasn't sure what to do here. This pr is about resolving the CVP issues and it doesn't care what value is set, just that it is set. I think it would be clearer if we create additional stories to resolve the FIPS compliance issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is our FIPS compliance mentioned anywhere in the documentation ?

@gkurz gkurz force-pushed the add-new-feature-annotation branch from ccc54a7 to 18ea38a Compare April 3, 2024 16:00
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2024
Copy link

openshift-ci bot commented Apr 3, 2024

New changes are detected. LGTM label has been removed.

@gkurz gkurz changed the base branch from devel to main April 3, 2024 16:01
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 3, 2024

@cpmeadors: This pull request references KATA-2881 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

- Description of the problem which is fixed/What is the use case
CVP downstream requires new annotations to exist in the CSV. https://docs.openshift.com/container-platform/4.15/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-annotations-infra_osdk-generating-csvs

Closes: KATA-2881

- What I did
Added the annotations to CSV. I set disconnected to true and all the rest false. We can update them if that is wrong, but this should satisfy CVP.

- How to verify it
Make bundle. Check bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml to see if new annotations are in rendered CSV

- Description for the changelog

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

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

Signed-off-by: Cameron Meadors <cmeadors@redhat.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
@gkurz gkurz force-pushed the add-new-feature-annotation branch from 18ea38a to be8fa65 Compare April 3, 2024 16:03
@gkurz gkurz merged commit 70f4684 into openshift:main Apr 3, 2024
2 of 4 checks passed
Copy link

openshift-ci bot commented Apr 3, 2024

@cpmeadors: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/check be8fa65 link false /test check

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

gkurz added a commit to gkurz/sandboxed-containers-operator that referenced this pull request Apr 4, 2024
This brings CSV fixes from openshift#389 and openshift#391, that we do want in devel.

This also brings openshift#388 that we *do not* want since it removes all
the 1.6.0 code from devel. This is addressed by a subsequent commit.
gkurz added a commit to gkurz/sandboxed-containers-operator that referenced this pull request Apr 8, 2024
…re-annotation"

This reverts commit 70f4684, reversing
changes made to bb538b1.

Signed-off-by: Greg Kurz <groug@kaod.org>
gkurz added a commit to gkurz/sandboxed-containers-operator that referenced this pull request Apr 8, 2024
…re-annotation"

This reverts commit 70f4684, reversing
changes made to bb538b1.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <groug@kaod.org>
@gkurz gkurz mentioned this pull request Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants