Skip to content

🌱 Prepare main branch for v1.12 development #12723

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 4 commits into from
Sep 4, 2025
Merged

🌱 Prepare main branch for v1.12 development #12723

merged 4 commits into from
Sep 4, 2025

Conversation

chrischdi
Copy link
Member

/area release

Part of release tasks for v1.12

@k8s-ci-robot k8s-ci-robot added area/release Issues or PRs related to releasing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 2, 2025
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 2, 2025
@chrischdi chrischdi force-pushed the pr-prepare-main-1-12 branch from 0d0510a to c9e39ba Compare September 2, 2025 14:47
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main

/test pull-cluster-api-e2e-blocking-main

/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-34-1-35-main

/test pull-cluster-api-test-main

/test pull-cluster-api-test-mink8s-main

/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main

pull-cluster-api-build-main

pull-cluster-api-e2e-blocking-main

pull-cluster-api-test-main

pull-cluster-api-verify-main

In response to this:

/test help

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.

@chrischdi
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-34-1-35-main
/test pull-cluster-api-test-mink8s-main

@sbueringer
Copy link
Member

/hold
to merge #12634 first

@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 Sep 2, 2025
sbueringer
sbueringer reviewed Sep 2, 2025
View reviewed changes
fabriziopandini
fabriziopandini reviewed Sep 2, 2025
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm pending comments + checking E2E tests

@fabriziopandini
Copy link
Member

from a quick check, the E2E are failing for

cause: <*runtime.missingVersionErr | 0xc00061df30>{
data: "unstructured object has no version",
},
msg: "failed to retrieve DockerMachinePool

I think we should wait for #12634 to merge before looking into this (not sure if it is fixing this issue, but there are changes wrt to when gvk is set or not by controller runtime)

@chrischdi chrischdi force-pushed the pr-prepare-main-1-12 branch from c9e39ba to 8054ff1 Compare September 3, 2025 11:16
@chrischdi chrischdi force-pushed the pr-prepare-main-1-12 branch from 8054ff1 to 26cef80 Compare September 3, 2025 11:37
@chrischdi
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-34-1-35-main
/test pull-cluster-api-test-mink8s-main

@chrischdi
Copy link
Member Author

from a quick check, the E2E are failing for

cause: <*runtime.missingVersionErr | 0xc00061df30>{
data: "unstructured object has no version",
},
msg: "failed to retrieve DockerMachinePool

I think we should wait for #12634 to merge before looking into this (not sure if it is fixing this issue, but there are changes wrt to when gvk is set or not by controller runtime)

Was unrelated to CR change.
It was due to changing from ObjectReference to the ContractVersionedObjectReference AND the first time running this test with a version where this part of the code uses v1beta2.

@mboersma
Copy link
Contributor

mboersma commented Sep 3, 2025

/cc @pratik-mahalle

@k8s-ci-robot
Copy link
Contributor

@mboersma: GitHub didn't allow me to request PR reviews from the following users: pratik-mahalle.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @pratik-mahalle

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.

@chrischdi
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-34-1-35-main
/test pull-cluster-api-test-mink8s-main

@chrischdi
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2025
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 4, 2025
@sbueringer
Copy link
Member

Thank you very much!!

/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 Sep 4, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8c7d6ce725c32d166d20a1ec7950a2803040f1f4

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 4, 2025
@k8s-ci-robot k8s-ci-robot merged commit dc25710 into kubernetes-sigs:main Sep 4, 2025
26 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Sep 4, 2025
@sbueringer sbueringer mentioned this pull request Sep 16, 2025
Open
38 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@elmiko elmiko Awaiting requested review from elmiko

@enxebre enxebre Awaiting requested review from enxebre

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release Issues or PRs related to releasing 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/XL Denotes a PR that changes 500-999 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.12
Development

Successfully merging this pull request may close these issues.
5 participants
@chrischdi @k8s-ci-robot @sbueringer @fabriziopandini @mboersma