Bug 1812019: PackageManifests should include Keywords #1520

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.

Sign up for GitHub

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

Jump to bottom

Merged

openshift-merge-robot merged 1 commit into operator-framework:master from awgreene:packagemanifests-keywords

May 17, 2020

Member

awgreene commented May 13, 2020 •

edited

Loading

Problem:
Although CSVs allow users to define keywords for their operators, these
keywords are not available in the PackageManifest created for the
operator.

Solution:
Copy the keywords from the CSV to the PackageManifest.

openshift-ci-robot added the bugzilla/severity-medium label

Collaborator

openshift-ci-robot commented May 13, 2020

@awgreene: This pull request references Bugzilla bug 1812019, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1812019: PackageManifests should include Keywords

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.

openshift-ci-robot added the bugzilla/valid-bug label

ecordell reviewed

View reviewed changes

Member

ecordell left a comment

this looks good, but we should probably go ahead and include the rest of the metadata: links, maintainers, maturity

Collaborator

openshift-ci-robot commented May 13, 2020

@awgreene: This pull request references Bugzilla bug 1812019, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1812019: PackageManifests should include Keywords

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.

openshift-ci-robot requested review from dinhxuanvu and ecordell

May 13, 2020 21:33

Member Author

awgreene commented May 13, 2020

this looks good, but we should probably go ahead and include the rest of the metadata: links, maintainers, maturity

Are these items that people would want to search on? I suppose Maturity may be, but it seems odd to allow people to search based on links or maintainers.

dinhxuanvu approved these changes

View reviewed changes

Member

dinhxuanvu left a comment

/lgtm

openshift-ci-robot assigned dinhxuanvu

openshift-ci-robot added the lgtm label

awgreene force-pushed the packagemanifests-keywords branch from ffcee67 to 54f19f2 Compare

May 14, 2020 15:35

openshift-ci-robot removed the lgtm label

awgreene force-pushed the packagemanifests-keywords branch 2 times, most recently from cd3d5d5 to 087c0bd Compare

May 14, 2020 15:50


          PackageManifests should include CSV Metadata

c81f025

Problem:
Although CSVs allow users to define keywords for their operators, these
keywords are not available in the PackageManifest created for the
operator.

Solution:
Copy the keywords, links, maintainers, and maturity from the CSV to the
PackageManifest.

awgreene force-pushed the packagemanifests-keywords branch from 087c0bd to c81f025 Compare

May 14, 2020 15:58

anik120 requested changes

View reviewed changes

Contributor

anik120 left a comment

@awgreene I have one question. Otherwise looks good to me.

pkg/package-server/apis/operators/packagemanifest.go Show resolved Hide resolved

Member Author

awgreene commented May 14, 2020

/retest

2 similar comments

Member Author

awgreene commented May 14, 2020

/retest

Member Author

awgreene commented May 14, 2020

/retest

Member

exdx commented May 14, 2020

/lgtm

openshift-ci-robot assigned exdx

openshift-ci-robot added the lgtm label

dinhxuanvu approved these changes

View reviewed changes

Member

dinhxuanvu left a comment

/lgtm

Member Author

awgreene commented May 15, 2020

/retest

1 similar comment

Member Author

awgreene commented May 15, 2020

/retest

ecordell approved these changes

View reviewed changes

Member

ecordell left a comment

/lgtm

openshift-ci-robot assigned ecordell

Collaborator

openshift-ci-robot commented May 15, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, dinhxuanvu, ecordell

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:

~~OWNERS~~ [ecordell]

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

Contributor

openshift-bot commented May 16, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

23 similar comments

Contributor

openshift-bot commented May 16, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 16, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 16, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 16, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 17, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot merged commit 227f9dc into operator-framework:master

Collaborator

openshift-ci-robot commented May 17, 2020

@awgreene: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1520. Bugzilla bug 1812019 has been moved to the MODIFIED state.

In response to this:

Bug 1812019: PackageManifests should include Keywords

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.

Member

ecordell commented May 27, 2020

/cherry-pick release-4.4

openshift-cherrypick-robot commented May 27, 2020

@ecordell: #1520 failed to apply on top of branch "release-4.4":

Using index info to reconstruct a base tree...
M	pkg/package-server/apis/operators/packagemanifest.go
M	pkg/package-server/apis/operators/packagemanifest_types.go
M	pkg/package-server/apis/operators/v1/packagemanifest.go
M	pkg/package-server/apis/operators/v1/packagemanifest_types.go
M	pkg/package-server/apis/operators/v1/zz_generated.conversion.go
M	pkg/package-server/apis/operators/v1/zz_generated.deepcopy.go
M	pkg/package-server/apis/operators/zz_generated.deepcopy.go
M	pkg/package-server/client/openapi/zz_generated.openapi.go
M	test/e2e/packagemanifest_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/packagemanifest_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/packagemanifest_e2e_test.go
Auto-merging pkg/package-server/client/openapi/zz_generated.openapi.go
CONFLICT (content): Merge conflict in pkg/package-server/client/openapi/zz_generated.openapi.go
Auto-merging pkg/package-server/apis/operators/zz_generated.deepcopy.go
Auto-merging pkg/package-server/apis/operators/v1/zz_generated.deepcopy.go
Auto-merging pkg/package-server/apis/operators/v1/zz_generated.conversion.go
Auto-merging pkg/package-server/apis/operators/v1/packagemanifest_types.go
Auto-merging pkg/package-server/apis/operators/v1/packagemanifest.go
CONFLICT (content): Merge conflict in pkg/package-server/apis/operators/v1/packagemanifest.go
Auto-merging pkg/package-server/apis/operators/packagemanifest_types.go
Auto-merging pkg/package-server/apis/operators/packagemanifest.go
CONFLICT (content): Merge conflict in pkg/package-server/apis/operators/packagemanifest.go
error: Failed to merge in the changes.
Patch failed at 0001 PackageManifests should include CSV Metadata

In response to this:

/cherry-pick release-4.4

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.

Member Author

awgreene commented May 27, 2020

/cherry-pick release-4.4

openshift-cherrypick-robot commented May 27, 2020

@awgreene: #1520 failed to apply on top of branch "release-4.4":

Using index info to reconstruct a base tree...
M	pkg/package-server/apis/operators/packagemanifest.go
M	pkg/package-server/apis/operators/packagemanifest_types.go
M	pkg/package-server/apis/operators/v1/packagemanifest.go
M	pkg/package-server/apis/operators/v1/packagemanifest_types.go
M	pkg/package-server/apis/operators/v1/zz_generated.conversion.go
M	pkg/package-server/apis/operators/v1/zz_generated.deepcopy.go
M	pkg/package-server/apis/operators/zz_generated.deepcopy.go
M	pkg/package-server/client/openapi/zz_generated.openapi.go
M	test/e2e/packagemanifest_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/packagemanifest_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/packagemanifest_e2e_test.go
Auto-merging pkg/package-server/client/openapi/zz_generated.openapi.go
CONFLICT (content): Merge conflict in pkg/package-server/client/openapi/zz_generated.openapi.go
Auto-merging pkg/package-server/apis/operators/zz_generated.deepcopy.go
Auto-merging pkg/package-server/apis/operators/v1/zz_generated.deepcopy.go
Auto-merging pkg/package-server/apis/operators/v1/zz_generated.conversion.go
Auto-merging pkg/package-server/apis/operators/v1/packagemanifest_types.go
Auto-merging pkg/package-server/apis/operators/v1/packagemanifest.go
CONFLICT (content): Merge conflict in pkg/package-server/apis/operators/v1/packagemanifest.go
Auto-merging pkg/package-server/apis/operators/packagemanifest_types.go
Auto-merging pkg/package-server/apis/operators/packagemanifest.go
CONFLICT (content): Merge conflict in pkg/package-server/apis/operators/packagemanifest.go
error: Failed to merge in the changes.
Patch failed at 0001 PackageManifests should include CSV Metadata

In response to this:

/cherry-pick release-4.4

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 bugzilla/severity-medium bugzilla/valid-bug lgtm