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

Add OCP annotation to OKD bundle #137

Merged

Conversation

clobrano
Copy link
Contributor

Why we need this PR

OKD community pipeline is verifying the presence of OCP annotation.

Changes made

Add OCP annotation to OKD bundle

Which issue(s) this PR fixes

Test plan

Copy link
Contributor

openshift-ci bot commented Jul 25, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@clobrano
Copy link
Contributor Author

/test 4.16-openshift-e2e

@beekhof
Copy link
Contributor

beekhof commented Jul 25, 2024

Looks sane to me, do we understand all the annotations?
We should also make sure there is a backlog item for being FIPS compliant

Makefile Outdated
@@ -329,9 +338,25 @@ verify-previous-version: ## Verifies that PREVIOUS_VERSION variable is set
.PHONY: bundle-community-rh
bundle-community-rh: bundle ## Update displayName field in the bundle's CSV
sed -r -i "s|displayName: Machine Deletion Remediation operator.*|displayName: Machine Deletion Remediation Operator - Community Edition|;" ${CSV}
$(MAKE) add-replaces-field
Copy link
Member

Choose a reason for hiding this comment

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

I don't find this target?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doh, sorry, it's a leftover.
MDR only have 1 bundle (OKD) that needs the replaces field, so there's no need to specialize this part

@clobrano
Copy link
Contributor Author

clobrano commented Jul 26, 2024

Looks sane to me, do we understand all the annotations? We should also make sure there is a backlog item for being FIPS compliant

we have ECOPROJECT-1972 to track the task, and there is a dedicated documentation page for the annotation

OKD community pipeline is verifying the presence of OCP annotation.

Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
@clobrano clobrano force-pushed the add-mandatory-annotation-for-okd branch from 23b8222 to 5805c51 Compare July 26, 2024 09:00
@clobrano
Copy link
Contributor Author

/test 4.16-openshift-e2e

Copy link
Contributor

openshift-ci bot commented Aug 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: clobrano, slintes

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@clobrano clobrano marked this pull request as ready for review August 7, 2024 07:42
@openshift-ci openshift-ci bot requested review from beekhof and mshitrit August 7, 2024 07:42
@openshift-merge-bot openshift-merge-bot bot merged commit d96afea into medik8s:main Aug 7, 2024
27 checks passed
@clobrano clobrano deleted the add-mandatory-annotation-for-okd branch August 8, 2024 15:10
@clobrano
Copy link
Contributor Author

clobrano commented Aug 8, 2024

/cherry-pick release-0.3

@openshift-cherrypick-robot

@clobrano: #137 failed to apply on top of branch "release-0.3":

Applying: Add OCP annotation to OKD bundle
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add OCP annotation to OKD bundle
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.3

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants