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

OCPVE-675: feat: bump api to add OLM capability #7495

Merged
merged 2 commits into from
Oct 16, 2023

Conversation

eggfoobar
Copy link
Contributor

@eggfoobar eggfoobar commented Sep 18, 2023

Bump API to include new OLM capability

Updated validation logic to make sure Marketplace can not be enabled while OLM is disabled. Marketplace has a hard dependency on OLM.

Added unit test for validation addition

/hold

Waiting on API change to be merged in. openshift/api#1589

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 18, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 18, 2023

@eggfoobar: This pull request references OCPVE-675 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.15.0" version, but no target version was set.

In response to this:

Bump API to include new OLM capability

Updated validation logic to make sure Marketplace can not be enabled while OLM is disabled. Marketplace has a hard dependency on OLM.

/hold

Waiting on API change to be merged in. openshift/api#1589

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 openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 18, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 16, 2023

@eggfoobar: This pull request references OCPVE-675 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.15.0" version, but no target version was set.

In response to this:

Bump API to include new OLM capability

Updated validation logic to make sure Marketplace can not be enabled while OLM is disabled. Marketplace has a hard dependency on OLM.

Added unit test for validation addition

/hold

Waiting on API change to be merged in. openshift/api#1589

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.

@eggfoobar
Copy link
Contributor Author

/unhold

This should be good for a review now that API has merged in

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 16, 2023
added validation check for the hard dependency of marketplace to OLM
added unit tests for capability validation
ran go generate

Signed-off-by: ehila <[email protected]>
@eggfoobar
Copy link
Contributor Author

/cc @kevinrizza

@openshift-ci openshift-ci bot requested a review from kevinrizza October 16, 2023 15:24
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 16, 2023
expectedError: `additionalEnabledCapabilities: Invalid value: \[\]v1.ClusterVersionCapability{"marketplace"}: the marketplace capability requires the OperatorLifecycleManager capability`,
},
{
name: "invalid capability baremetal specified without MachineAPI",
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 test seems unrelated to the current PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apologies, I noticed we were missing one for that case, so I figured it wouldn't hurt to add one since they're a similar code path

@sadasu
Copy link
Contributor

sadasu commented Oct 16, 2023

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sadasu

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 Oct 16, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 16, 2023

@eggfoobar: The following tests 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/okd-e2e-aws-ovn-upgrade 36e0844 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/okd-scos-e2e-aws-ovn 36e0844 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-e2e-aws-ovn 36e0844 link false /test okd-e2e-aws-ovn

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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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