Skip to content

Conversation

@ramessesii2
Copy link

@ramessesii2 ramessesii2 commented Oct 10, 2025

Implements a new clusterctl convert command to convert core CAPI resources i.e., cluster.x-k8s.io resources between API versions, currently supporting v1beta1 → v1beta2 migration.

✅ Tests
✅ Docs

Implements #12716

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 10, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign justinsb for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-area PR is missing an area label label Oct 10, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @ramessesii2!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 10, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @ramessesii2. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 15, 2025
@ramessesii2 ramessesii2 changed the title feat: add clusterctl alpha migrate command feat: add experimental clusterctl migrate command Oct 15, 2025
@ramessesii2 ramessesii2 force-pushed the RAMESSES/migrate-cmd branch 3 times, most recently from 6f90e35 to c2050f4 Compare October 15, 2025 08:51
@ramessesii2 ramessesii2 marked this pull request as ready for review October 15, 2025 08:52
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 15, 2025
@ramessesii2 ramessesii2 changed the title feat: add experimental clusterctl migrate command ✨ feat: add experimental clusterctl migrate command Oct 15, 2025
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

did a quick first pass on migrate.go

please keep the commits squashed to 1 on amends.

@sbueringer
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Oct 16, 2025
@fabriziopandini
Copy link
Member

/area clusterctl

@k8s-ci-robot k8s-ci-robot added the area/clusterctl Issues or PRs related to clusterctl label Oct 16, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Oct 16, 2025
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

thanks for the updates. i did a bigger pass on the code today.
this is in relatively good shape, but i made some suggestions to re-organize it a bit and make api types opaque to the migrate package.


Examples:
# Migrate from file to stdout
clusterctl migrate cluster.yaml
Copy link
Member

Choose a reason for hiding this comment

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

would migrate from new to old be supported?
e.g. v1beta2 -> v1beta1

Copy link
Author

Choose a reason for hiding this comment

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

I'm thinking what are the usecase where a user would downgrade! And even with warnings, there might be data loss while downgrading.
If may suggest, could we please keep it to the scope of the issue as it's already experimental but definitely mark your question.

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

@ramessesii2 thanks for this PR and sorry for the delay in the review.

Two main comments from my side

  • The code should be structured to support usage of clusterctl as a library
  • I would suggest to simplify the code as much as possible, the code target a specific use case and we do not expect to change this code frequently (let's prefer simplicity over extensibility)

See comments for more details; also feel free to pin me in the CAPI channel if you need more clarifications

func (c *Converter) ConvertResource(info ResourceInfo, obj runtime.Object) ConversionResult {
gvk := info.GroupVersionKind

if gvk.Group == clusterv1.GroupVersion.Group && gvk.Version == c.targetGV.Version {
Copy link
Member

Choose a reason for hiding this comment

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

Am I wrong or this should never happen considering we are calling func this only when dealing with ResourceTypeCoreV1Beta1 objects?

If this is the case, either drop or return an error in this case
(the warning is not actionable for users, because it is surfacing an error in the code)

@sbueringer
Copy link
Member

@ramessesii2 Do you have time to address the findings above?

@ramessesii2
Copy link
Author

@ramessesii2 Do you have time to address the findings above?

Hey @sbueringer, sorry for the delay. I've been working on the major refactoring suggested in the reviews. Almost there, I'll push it by EDO

    - Experimental migration support focuses on v1beta1 to v1beta2
    conversions for core Cluster API resources

Signed-off-by: Satyam Bhardwaj <[email protected]>
Copy link
Author

@ramessesii2 ramessesii2 left a comment

Choose a reason for hiding this comment

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

I've addressed most of the reviews, other might not be applicable post the refactoring.

@ramessesii2 ramessesii2 changed the title ✨ feat: add experimental clusterctl migrate command ✨ feat: add experimental clusterctl convert command Nov 12, 2025
    - Move to new `Convert` method in clusterctl client interface from
        the proposed migrate.
    - Create new conversion package with parsing and conversion utilities
    - Remove deprecated `migrate` command and related internal migration code

Signed-off-by: Satyam Bhardwaj <[email protected]>
@ramessesii2
Copy link
Author

@neolit123 @fabriziopandini @sbueringer Thanks for your initial reviews. Based on those, I've refactored code into a new commit. I'll squash it once we're ready to merge or let me know if you prefer that right away.

@k8s-ci-robot
Copy link
Contributor

@ramessesii2: 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
pull-cluster-api-apidiff-main e2b91c1 link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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

area/clusterctl Issues or PRs related to clusterctl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants