Skip to content

⚠️ Migrate API to use *Seconds instead of metav1.Duration fields #12327

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 3 commits into from
Jun 11, 2025
Merged

⚠️ Migrate API to use *Seconds instead of metav1.Duration fields #12327

merged 3 commits into from
Jun 11, 2025

Conversation

@sbueringer
Copy link
Member

@sbueringer sbueringer commented Jun 5, 2025 •
edited
Loading

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Part of #10852

WIP => not finished yet + contains multiple other PRs

@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. do-not-merge/needs-area PR is missing an area label labels Jun 5, 2025
@k8s-ci-robot k8s-ci-robot requested review from elmiko and g-gaston June 5, 2025 19:15
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 5, 2025
@sbueringer sbueringer changed the title [WIP] ⚠️ Remove version handling of unsupported Kubernetes versions from KCP [WIP] ⚠️ Migrate API to use *Seconds instead of metav1.Duration fields Jun 5, 2025
@sbueringer sbueringer force-pushed the pr-nodurations branch 3 times, most recently from be504a8 to 9ef4092 Compare June 6, 2025 12:45
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sbueringer sbueringer added the area/api Issues or PRs related to the APIs label Jun 6, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jun 6, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 6, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 6, 2025
@sbueringer
Copy link
Member Author

/hold

Contains #12319 (but this PR is also not ready yet)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 6, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sbueringer sbueringer force-pushed the pr-nodurations branch 2 times, most recently from 3a4bfaa to 1dbd38b Compare June 6, 2025 16:02
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sbueringer sbueringer changed the title [WIP] ⚠️ Migrate API to use *Seconds instead of metav1.Duration fields ⚠️ Migrate API to use *Seconds instead of metav1.Duration fields Jun 6, 2025
@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 Jun 6, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@fabriziopandini
Copy link
Member

/test pull-cluster-api-e2e-main

fabriziopandini
fabriziopandini reviewed Jun 9, 2025
View reviewed changes
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.

SGTM
I will take another look after rebase

docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md Outdated
- The `unhealthyConditions` field has been renamed to `unhealthyNodeConditions` in following struct:
- `spec.topology.controlPlane.machineHealthCheck`
- `spec.topology.workers.machineDeployments[].machineHealthCheck`
- The following fields in `spec.topology.{controlPlane,workers.machineDeployments[],workers.machinePools[]` have been renamed: (their type was also changed from Duration to int)
Copy link
Member

Choose a reason for hiding this comment

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

nit

Suggested change
- The following fields in `spec.topology.{controlPlane,workers.machineDeployments[],workers.machinePools[]` have been renamed: (their type was also changed from Duration to int)
- All the fields of type Duration in `spec.topology.{controlPlane,workers.machineDeployments[],workers.machinePools[]` have been renamed by adding the `Seconds` suffix and their type was changed to int32, thus aligning to K8s guidelines.

Same in few other places

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 10, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3c98f897a75aac2c6f5132a8c6272886b8e36ed6

@sbueringer sbueringer mentioned this pull request Jun 10, 2025
Merged
fabriziopandini
fabriziopandini reviewed Jun 10, 2025
View reviewed changes
bootstrap/kubeadm/config/crd/kustomization.yaml
- pairs:
# Note: This is needed so the topology reconciler can figure out
# the contract of v1beta1 when v1beta1 objects are used in ClusterClasses.
cluster.x-k8s.io/v1beta1: v1beta1
Copy link
Member

Choose a reason for hiding this comment

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

Good catch!
TIL!

fabriziopandini
fabriziopandini reviewed Jun 10, 2025
View reviewed changes
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.

Great work!
I really like how consistency is improving across all the API types.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 10, 2025
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 11, 2025
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sbueringer
Copy link
Member Author

/override pull-cluster-api-e2e-latestk8s-main

Test was green enough :) (xref: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api/12327/pull-cluster-api-e2e-latestk8s-main/1932643934211674112)

@k8s-ci-robot
Copy link
Contributor

@sbueringer: Overrode contexts on behalf of sbueringer: pull-cluster-api-e2e-latestk8s-main

In response to this:

/override pull-cluster-api-e2e-latestk8s-main

Test was green enough :) (xref: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api/12327/pull-cluster-api-e2e-latestk8s-main/1932643934211674112)

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.

fabriziopandini
fabriziopandini reviewed Jun 11, 2025
View reviewed changes
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.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6dcfa12bb3bf18705bcc2fa0199946fd583bdd3b

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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

@k8s-ci-robot k8s-ci-robot merged commit db39f5f into kubernetes-sigs:main Jun 11, 2025
24 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jun 11, 2025
@sbueringer sbueringer deleted the pr-nodurations branch June 11, 2025 10:01
@sbueringer sbueringer mentioned this pull request Jun 11, 2025
Closed
62 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@elmiko elmiko Awaiting requested review from elmiko

@g-gaston g-gaston Awaiting requested review from g-gaston

@chrischdi chrischdi Awaiting requested review from chrischdi

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Issues or PRs related to the APIs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Milestone

v1.11

Development

Successfully merging this pull request may close these issues.

4 participants

@sbueringer @fabriziopandini @chrischdi @k8s-ci-robot