Skip to content

OTA-1010: Add a new version of GetImplicitlyEnabledCapabilities #1133

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

hongkailiu
Copy link
Member

@hongkailiu hongkailiu commented Jan 7, 2025

Add a new version of GetImplicitlyEnabledCapabilities that is going to be lifted to library-go.

At the moment, we keep the function here temporarily to ensure it works for CVO.
We should also keep it in mind once it goes to library-go, the function should be also usable for oc-cli, e.g., the extract command.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 7, 2025

@hongkailiu: This pull request references OTA-1010 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.19.0" version, but no target version was set.

In response to this:

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 7, 2025
@openshift-ci openshift-ci bot requested review from DavidHurta and wking January 7, 2025 20:15
@hongkailiu hongkailiu force-pushed the new-GetImplicitlyEnabledCapabilities branch 3 times, most recently from fd5df0e to bb6b61b Compare January 7, 2025 21:22
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 7, 2025

@hongkailiu: This pull request references OTA-1010 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.19.0" version, but no target version was set.

In response to this:

Add a new version of GetImplicitlyEnabledCapabilities that is going to be lifted to library-go.

At the moment, we keep it function here temporarily to ensure the signature of the function works for CVO.
We should also keep it in mind once it goes to library-go, the function should be also usable for oc-cli, e.g., the extract command.

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-robot
Copy link
Contributor

openshift-ci-robot commented Jan 7, 2025

@hongkailiu: This pull request references OTA-1010 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.19.0" version, but no target version was set.

In response to this:

Add a new version of GetImplicitlyEnabledCapabilities that is going to be lifted to library-go.

At the moment, we keep it function here temporarily to ensure the function works for CVO.
We should also keep it in mind once it goes to library-go, the function should be also usable for oc-cli, e.g., the extract command.

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-robot
Copy link
Contributor

openshift-ci-robot commented Jan 8, 2025

@hongkailiu: This pull request references OTA-1010 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.19.0" version, but no target version was set.

In response to this:

Add a new version of GetImplicitlyEnabledCapabilities that is going to be lifted to library-go.

At the moment, we keep the function here temporarily to ensure it works for CVO.
We should also keep it in mind once it goes to library-go, the function should be also usable for oc-cli, e.g., the extract command.

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.

@hongkailiu hongkailiu force-pushed the new-GetImplicitlyEnabledCapabilities branch from bb6b61b to eb37012 Compare January 14, 2025 01:05
@hongkailiu hongkailiu force-pushed the new-GetImplicitlyEnabledCapabilities branch from eb37012 to 79916aa Compare March 4, 2025 20:49
@hongkailiu
Copy link
Member Author

/hold

Will rebase after #1159 gets in.

@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 Mar 4, 2025
@hongkailiu
Copy link
Member Author

/test images

@hongkailiu
Copy link
Member Author

/retest-required

@hongkailiu hongkailiu force-pushed the new-GetImplicitlyEnabledCapabilities branch from c4bb400 to 9cdc271 Compare March 7, 2025 23:32
@hongkailiu
Copy link
Member Author

/retest-required
/hold cancel

@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 Mar 10, 2025
@hongkailiu
Copy link
Member Author

/test okd-scos-e2e-aws-ovn

1 similar comment
@hongkailiu
Copy link
Member Author

/test okd-scos-e2e-aws-ovn

Copy link
Contributor

openshift-ci bot commented Mar 10, 2025

@hongkailiu: 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/okd-scos-e2e-aws-ovn 9cdc271 link false /test okd-scos-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-sigs/prow repository. I understand the commands that are listed here.

@DavidHurta
Copy link
Contributor

/uncc
I am under the impression that Trevor will have a look. Ping me if needed.

@openshift-ci openshift-ci bot removed the request for review from DavidHurta April 24, 2025 16:42
// In other words, whether, or not the cluster version operator reconcile that manifest on the cluster.
// The two sets of manifests are respectively from the release that is currently running on the cluster and
// from the release that the cluster is updated to.
func GetImplicitlyEnabledCapabilities(
Copy link
Member

Choose a reason for hiding this comment

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

How do we test this implementation is:

  1. Correct?
  2. Equivalent to the deleted GetImplicitlyEnabledCapabilities?

For (1) I assume that we'll need tests once we lift it to o/library-go so why not write them right away?
For (2) I wonder if if would be proper to keep the old implementation for a while, implement a test that shows that the two implementations are equivalent (same inputs -> same outputs) and only delete the code (and the equivalence test) once the o/library-go implementation fully settles?

Copy link
Member Author

Choose a reason for hiding this comment

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

For (2): There are tests for it already.

func TestGetImplicitlyEnabledCapabilities(t *testing.T) {

At least, from those tests point of view, they are equivalent.

For (1):

I moved over the unit tests from (2) to https://github.com/openshift/library-go/pull/1908/files with modifications

  • to fit the new function signature (added a new arg manifestInclusionConfiguration), and
  • to avoid copying testdata/payloadcapabilitytest there and convincing o/lib approvers that it OK to do it .

Copy link
Member

Choose a reason for hiding this comment

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

Ah okay, we have tests on the payload-level GetImplicitlyEnabledCapabilities which calls the new function, good!

:shipit: then

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 6, 2025
Copy link
Contributor

openshift-ci bot commented May 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, petr-muller

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 May 6, 2025
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