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

fix: update csv correctly. #171

Merged
merged 1 commit into from
Apr 25, 2022
Merged

Conversation

sp98
Copy link
Contributor

@sp98 sp98 commented Apr 25, 2022

CSV was updated directly under the manifests directory. This PR fixes
it. Makes correct changes and runs make bundle to auto generate the
csv file.

Following changes are made the the csv:

  1. Add suggested namespace annotation.
  2. Add category
  3. Mark certain CRDs as internal so that they are not visible in the UI.

Signed-off-by: Santosh Pillai sapillai@redhat.com

CSV was updated directly under the manifests directory. This PR fixes
it. Makes correct changes and runs `make bundle` to auto generate the
csv file.

Following changes are made the the csv:
1. Add suggested namespace annotation.
2. Add category
3. Mark certain CRDs as internal so that they are not visible in the UI.

Signed-off-by: Santosh Pillai <sapillai@redhat.com>
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 25, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 25, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nbalacha, sp98

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 25, 2022
@openshift-merge-robot openshift-merge-robot merged commit dc75c58 into openshift:main Apr 25, 2022
@nbalacha
Copy link
Contributor

/cherry-pick release-4.10

@openshift-cherrypick-robot

@nbalacha: #171 failed to apply on top of branch "release-4.10":

Applying: fix: update csv correctly
Using index info to reconstruct a base tree...
M	bundle/manifests/lvm-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/lvm-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/lvm-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: update csv correctly
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-4.10

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants