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

OCPBUGS-15654: Add MAPI to all capability sets #1554

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

qJkee
Copy link
Contributor

@qJkee qJkee commented Aug 11, 2023

For background on the motivation of this change, the baremetal capability set relies on the MachineAPI capability set. Since MachineAPI didn't exist as a capability set in previous releases, the v4.11 through v4.13 capability sets did not include it.
This meant, for a 4.14 onwards install, specifying the v4.13 or lower baseline capability set resulted in a cluster without the MachineAPI, which, on platforms relying on the baremetal capability, would create a non-obvious failure during the installation procedure.
To mitigate this, we add the MachineAPI capability where the baremetal capability is present, allowing the earlier capability sets to continue to be used and produce the same result as in previous releases.

This is also related PRs

  1. Add baremetal capability validation installer#7394
  2. Ensure baremetal cap is not enabled without MachineAPI cap #1537

In order to make capability sets working properly we had to add
MAPI capability everywhere where baremetal capability present.
We also add api and installer validation to ensure that baremetal
and MAPI enabled together, see
1. openshift/installer#7394
2. openshift#1537
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 11, 2023
@openshift-ci-robot
Copy link

@qJkee: This pull request references Jira Issue OCPBUGS-15654, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

In order to make capability sets working properly we had to add MAPI capability everywhere where baremetal capability present. We also add api and installer validation to ensure that baremetal and MAPI enabled together, see

  1. Add baremetal capability validation installer#7394
  2. Ensure baremetal cap is not enabled without MachineAPI cap #1537

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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 11, 2023
@qJkee
Copy link
Contributor Author

qJkee commented Aug 11, 2023

/jira refresh

@openshift-ci-robot
Copy link

@qJkee: This pull request references Jira Issue OCPBUGS-15654, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@qJkee
Copy link
Contributor Author

qJkee commented Aug 11, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 11, 2023
@openshift-ci-robot
Copy link

@qJkee: This pull request references Jira Issue OCPBUGS-15654, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

/jira refresh

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 openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 11, 2023
@qJkee
Copy link
Contributor Author

qJkee commented Aug 11, 2023

/cc @JoelSpeed @bparees

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 11, 2023

@qJkee: all tests passed!

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.

Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/lgtm

This must not be backported to other releases, discussed in slack https://redhat-internal.slack.com/archives/C032HSVS71T/p1691055174729009

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, qJkee

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 Aug 11, 2023
@openshift-merge-robot openshift-merge-robot merged commit 1468e81 into openshift:master Aug 11, 2023
7 checks passed
@openshift-ci-robot
Copy link

@qJkee: Jira Issue OCPBUGS-15654: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-15654 has been moved to the MODIFIED state.

In response to this:

In order to make capability sets working properly we had to add MAPI capability everywhere where baremetal capability present. We also add api and installer validation to ensure that baremetal and MAPI enabled together, see

  1. Add baremetal capability validation installer#7394
  2. Ensure baremetal cap is not enabled without MachineAPI cap #1537

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

@qJkee: Jira Issue OCPBUGS-15654 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

In response to this:

For background on the motivation of this change, the baremetal capability set relies on the MachineAPI capability set. Since MachineAPI didn't exist as a capability set in previous releases, the v4.11 through v4.13 capability sets did not include it.
This meant, for a 4.14 onwards install, specifying the v4.13 or lower baseline capability set resulted in a cluster without the MachineAPI, which, on platforms relying on the baremetal capability, would create a non-obvious failure during the installation procedure.
To mitigate this, we add the MachineAPI capability where the baremetal capability is present, allowing the earlier capability sets to continue to be used and produce the same result as in previous releases.

This is also related PRs

  1. Add baremetal capability validation installer#7394
  2. Ensure baremetal cap is not enabled without MachineAPI cap #1537

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.

rwsu added a commit to rwsu/installer that referenced this pull request Aug 30, 2023
The ClusterVersionCapabilitySets for v4.11, v4.12, v4.13 were
recently updated in openshift/api#1554
to include the MachineAPI Capability.

This change is needed to ensure the IPI MachineAPI Capability
precheck work correctly for those OpenShift versions.

Signed-off-by: Richard Su <rwsu@redhat.com>
rwsu added a commit to rwsu/installer that referenced this pull request Aug 30, 2023
The ClusterVersionCapabilitySets for v4.11, v4.12, v4.13 were
recently updated in openshift/api#1554
to include the MachineAPI Capability.

This change is needed to ensure the IPI MachineAPI Capability
precheck work correctly for those OpenShift versions.

Signed-off-by: Richard Su <rwsu@redhat.com>
rwsu added a commit to rwsu/installer that referenced this pull request Aug 30, 2023
The ClusterVersionCapabilitySets for v4.11, v4.12, v4.13 were
recently updated in openshift/api#1554
to include the MachineAPI Capability.

This change is needed to ensure the IPI MachineAPI Capability
precheck work correctly for those OpenShift versions.

Signed-off-by: Richard Su <rwsu@redhat.com>
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/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants