Skip to content

Conversation

@qJkee
Copy link
Contributor

@qJkee qJkee commented Jun 22, 2023

In order to merge openshift/machine-api-operator#1119 I need to add capability annotations to api files because they are directly copied at machine-api-operator

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 22, 2023
@openshift-ci openshift-ci bot requested review from JoelSpeed and mandre June 22, 2023 19:02
kind: CustomResourceDefinition
metadata:
annotations:
capability.openshift.io/name: MachineAPI+baremetal
Copy link
Member

Choose a reason for hiding this comment

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

The + syntax means that this Machine CRD will only be managed when both MachineAPI and baremetal are enabled. But it's not obvious to me why we wouldn't want Machine when MachineAPI alone was enabled and baremetal was not. I don't see anything in the commit message or pull request comments explaining how baremetal is involved. What is the context?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The context here is that baremetal operator require this crd to exist even if machine-api is disabled and baremetal enabled.
Also, as I know, baremetal operator does not exist at SNO clusters

Copy link
Contributor

Choose a reason for hiding this comment

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

Is there an or syntax for the capabilities?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JoelSpeed
No, according to the docs there is only "and"

Copy link
Member

Choose a reason for hiding this comment

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

The lack of or syntax is intentional, because:

Our current plan is to only annotate resources that are not depended upon (aka "leaf" components)

Is there a description somewhere about what the baremetal component enables when MachineAPI is disabled? There's not enough detail in the baremetal docstring for me to understand what overlaps with MachineAPI and what is distinct from MachineAPI.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@honza
Can you help with that? You added this capability and I think you might know more

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wking
I did a quick research and found that baremetal isn't present on SNO installs.
MachineAPI is specially designed for SNO, so I think we can remove baremetal dependency and keep it as MachineAPI only. This would be documented as well

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wking
Removed. Now it's only MachineAPI cap. It will be documented so no issues expected

@JoelSpeed
Are you ok with that?

@qJkee qJkee force-pushed the CNF-5643-make-operator-optional branch from 2e9e784 to eaabf87 Compare June 23, 2023 20:30
@qJkee qJkee requested a review from wking June 23, 2023 20:31
@JoelSpeed
Copy link
Contributor

You need to also include the ControlPlaneMachineSet CRD in this right?

@qJkee qJkee force-pushed the CNF-5643-make-operator-optional branch from 3c074b4 to 94a2b21 Compare June 26, 2023 12:10
@qJkee
Copy link
Contributor Author

qJkee commented Jun 26, 2023

@JoelSpeed
Good catch, fixed!

@qJkee
Copy link
Contributor Author

qJkee commented Jun 26, 2023

/test integration

@JoelSpeed
Copy link
Contributor

The integration tests timeout is at it's limit, it needs to be bumped

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 26, 2023

@qJkee: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@qJkee
Copy link
Contributor Author

qJkee commented Jun 26, 2023

@JoelSpeed
Done!

@JoelSpeed
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jun 27, 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

Details 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 27, 2023
@openshift-merge-robot openshift-merge-robot merged commit b88ff67 into openshift:master Jun 27, 2023
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. 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.

4 participants