Skip to content

NO-JIRA: Expand CAPI to Cluster API and MAPI to Machine API#272

Open
RadekManak wants to merge 1 commit into
openshift:mainfrom
RadekManak:capitoclusterapi
Open

NO-JIRA: Expand CAPI to Cluster API and MAPI to Machine API#272
RadekManak wants to merge 1 commit into
openshift:mainfrom
RadekManak:capitoclusterapi

Conversation

@RadekManak
Copy link
Copy Markdown
Contributor

Expand CAPI to Cluster API and MAPI to Machine api in user facing strings.

This should cover all occurrences, as I have generated this using sed a manually filtered test strings that don't have to follow this convention.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 14, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 14, 2025
@RadekManak RadekManak marked this pull request as ready for review March 14, 2025 19:49
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 14, 2025
@openshift-ci openshift-ci Bot requested review from JoelSpeed and nrb March 14, 2025 19:50
@RadekManak RadekManak changed the title Expand CAPI to Cluster API and MAPI to Machine api Expand CAPI to Cluster API and MAPI to Machine API Mar 14, 2025
@RadekManak RadekManak changed the title Expand CAPI to Cluster API and MAPI to Machine API NO-JIRA: Expand CAPI to Cluster API and MAPI to Machine API Mar 14, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 14, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@RadekManak: This pull request explicitly references no jira issue.

Details

In response to this:

Expand CAPI to Cluster API and MAPI to Machine api in user facing strings.

This should cover all occurrences, as I have generated this using sed a manually filtered test strings that don't have to follow this convention.

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.

Copy link
Copy Markdown

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

The expansion LGTM. There are other docs convention things that I would suggest changing, but I am guessing you'd prefer to keep commits sort of targeted to one topic.

I guess I can collect other things I notice and maybe open a PR myself later suggestions? In any case, this gives me a very good idea at what attempting something like that would look like.

@JoelSpeed
Copy link
Copy Markdown
Contributor

/approve
/assign @damdo

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jeana-redhat, JoelSpeed

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 Mar 17, 2025
@RadekManak
Copy link
Copy Markdown
Contributor Author

/retest

@theobarberbany
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2025
@damdo
Copy link
Copy Markdown
Member

damdo commented Mar 17, 2025

/hold

@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 17, 2025
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

A couple of places should not be changed.
The rest looks good.

/unlgtm

SatisfyAll(
ContainElement(And(HaveField("Type", Equal(configv1.OperatorAvailable)), HaveField("Status", Equal(configv1.ConditionTrue)),
HaveField("Message", Equal(fmt.Sprintf("Cluster CAPI Operator is available at %s", desiredOperatorReleaseVersion))))),
HaveField("Message", Equal(fmt.Sprintf("Cluster Cluster API Operator is available at %s", desiredOperatorReleaseVersion))))),
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should stay as is.

conds := []configv1.ClusterOperatorStatusCondition{
operatorstatus.NewClusterOperatorStatusCondition(capiInstallerControllerAvailableCondition, configv1.ConditionTrue, operatorstatus.ReasonAsExpected,
"CAPI Installer Controller works as expected"),
"Cluster API Installer Controller works as expected"),
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

All these CAPI Installer Controller should stay as is, as that's the actual controller name.

Comment thread pkg/operatorstatus/operator_status.go Outdated

if availableConditionMsg == "" {
availableConditionMsg = fmt.Sprintf("Cluster CAPI Operator is available at %s", r.ReleaseVersion)
availableConditionMsg = fmt.Sprintf("Cluster Cluster API Operator is available at %s", r.ReleaseVersion)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should not change

@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 17, 2025

New changes are detected. LGTM label has been removed.

@RadekManak
Copy link
Copy Markdown
Contributor Author

/test unit

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 28, 2025
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

PR needs rebase.

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-sigs/prow repository.

@JoelSpeed
Copy link
Copy Markdown
Contributor

@RadekManak Could you please get this rebased? I think we should prio getting this through

@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 5, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jan 5, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Comment @coderabbitai help to get the list of available commands and usage tips.

@RadekManak
Copy link
Copy Markdown
Contributor Author

/lifecycle frozen

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 22, 2026

@RadekManak: The lifecycle/frozen label cannot be applied to Pull Requests.

Details

In response to this:

/lifecycle frozen

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.

@RadekManak
Copy link
Copy Markdown
Contributor Author

/remove-lifecycle stale

@openshift-ci openshift-ci Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 22, 2026
@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 24, 2026
@nrb
Copy link
Copy Markdown
Contributor

nrb commented Apr 24, 2026

/remove-lifecycle stale
/lifecycle frozen

@openshift-ci openshift-ci Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 24, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 24, 2026

@nrb: The lifecycle/frozen label cannot be applied to Pull Requests.

Details

In response to this:

/remove-lifecycle stale
/lifecycle frozen

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

openshift-ci Bot commented May 14, 2026

@RadekManak: 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/e2e-gcp-capi-techpreview 9624ac5 link true /test e2e-gcp-capi-techpreview
ci/prow/e2e-gcp-ovn-techpreview 9624ac5 link true /test e2e-gcp-ovn-techpreview
ci/prow/okd-scos-e2e-aws-ovn 9624ac5 link false /test okd-scos-e2e-aws-ovn
ci/prow/regression-clusterinfra-cucushift-rehearse-capi-aws-ipi 9624ac5 link false /test regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
ci/prow/e2e-openstack-ovn-techpreview 9624ac5 link true /test e2e-openstack-ovn-techpreview
ci/prow/e2e-aws-ovn-techpreview-upgrade 9624ac5 link true /test e2e-aws-ovn-techpreview-upgrade
ci/prow/e2e-azure-ovn-techpreview-upgrade 9624ac5 link true /test e2e-azure-ovn-techpreview-upgrade
ci/prow/e2e-aws-capi-techpreview-post-install 9624ac5 link true /test e2e-aws-capi-techpreview-post-install

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-sigs/prow 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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants