Skip to content

OCPEDGE-1734: feat: add ability to define capability set #1769

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
merged 1 commit into from
Jun 25, 2025
Merged

OCPEDGE-1734: feat: add ability to define capability set #1769

merged 1 commit into from
Jun 25, 2025

Conversation

eggfoobar
Copy link
Contributor

added ability to specify a capability set and additional capabilities in the install config.

@openshift-ci openshift-ci bot requested review from dtantsur and zaneb May 29, 2025 04:38
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented May 29, 2025

Hi @eggfoobar. Thanks for your PR.

I'm waiting for a openshift-metal3 member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 29, 2025
@eggfoobar
Copy link
Contributor Author

eggfoobar commented Jun 2, 2025 •
edited
Loading

Validated locally that this behaves as expected.

apiVersion: config.openshift.io/v1
kind: ClusterVersion
metadata:
  name: version
spec:
  capabilities:
    additionalEnabledCapabilities:
    - baremetal
    - MachineAPI
    - Ingress
    - CloudCredential
    - CloudControllerManager
    baselineCapabilitySet: None
  clusterID: 96d54609-9797-420c-b79e-95da12dd3567
status:
  availableUpdates: null
  capabilities:
    enabledCapabilities:
    - CloudControllerManager
    - CloudCredential
    - Ingress
    - MachineAPI
    - baremetal
    knownCapabilities:
    - Build
    - CSISnapshot
    - CloudControllerManager
    - CloudCredential
    - Console
    - DeploymentConfig
    - ImageRegistry
    - Ingress
    - Insights
    - MachineAPI
    - NodeTuning
    - OperatorLifecycleManager
    - OperatorLifecycleManagerV1
    - Storage
    - baremetal
    - marketplace
    - openshift-samples

@eggfoobar
Copy link
Contributor Author

eggfoobar commented Jun 5, 2025 •
edited
Loading

Hey @celebdor when you have a moment to look at this, this should be all set

@eggfoobar eggfoobar changed the title feat: add ability to define capability set OCPEDGE-1734: feat: add ability to define capability set Jun 9, 2025
@bfournie
Copy link
Contributor

bfournie commented Jun 9, 2025

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 9, 2025
@eggfoobar
Copy link
Contributor Author

/retest

1 similar comment
@eggfoobar
Copy link
Contributor Author

/retest

@eggfoobar
Copy link
Contributor Author

/retest-required

dtantsur
dtantsur reviewed Jun 10, 2025
View reviewed changes
dtantsur
dtantsur reviewed Jun 10, 2025
View reviewed changes
ocp_install_env.sh
@@ -181,6 +181,29 @@ EOF
fi
}

function capabilities_stanza() {
if [[ -n "$BASELINE_CAPABILITY_SET" ]]; then
cat <<EOF
Copy link
Member

Choose a reason for hiding this comment

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

nit: missing indentation (same below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean the cat command indentation @dtantsur , or the things its catting? The cat is following the indentation I saw in the other commands, but I can indent that, I just don't think I can indent the content of it with out causing yaml issues.

@dtantsur
Copy link
Member

/approve

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur

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 Jun 10, 2025
@eggfoobar
feat: add ability to define capability set
318346a 
added ability to specify a capability set and additional capabilities in
the install config.

Signed-off-by: ehila <[email protected]>
@eggfoobar eggfoobar force-pushed the add-capabilities-install-config branch from 0c66daa to 318346a Compare June 10, 2025 13:42
@eggfoobar
Copy link
Contributor Author

/retest-required

@eggfoobar
Copy link
Contributor Author

/test e2e-metal-ipi-bm

@eggfoobar
Copy link
Contributor Author

/retest-required

@MahnoorAsghar
Copy link
Contributor

/lgtm

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

/retest-required

3 similar comments
@eggfoobar
Copy link
Contributor Author

/retest-required

@eggfoobar
Copy link
Contributor Author

/retest-required

@eggfoobar
Copy link
Contributor Author

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit ff0f5d3 into openshift-metal3:master Jun 25, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtantsur dtantsur dtantsur left review comments

@zaneb zaneb Awaiting requested review from zaneb

Assignees

@MahnoorAsghar MahnoorAsghar

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eggfoobar @bfournie @dtantsur @MahnoorAsghar