Skip to content
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.

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

⚠️ Remove deprecated flag for old infra machine naming #11679

Merged

Conversation

mboersma
Copy link
Contributor

@mboersma mboersma commented Jan 13, 2025

What this PR does / why we need it:

Removes the flag --use-deprecated-infra-machine-naming, which was planned to disappear in CAPI v1.9.

Which issue(s) this PR fixes:
Refs #10576
Refs #11172

/area provider/control-plane-kubeadm
/area machineset

@k8s-ci-robot k8s-ci-robot added area/provider/control-plane-kubeadm Issues or PRs related to KCP area/machineset Issues or PRs related to machinesets cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 13, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 13, 2025
@mboersma
Copy link
Contributor Author

/cc @lentzi90

@k8s-ci-robot k8s-ci-robot requested a review from lentzi90 January 13, 2025 23:24
@mboersma mboersma mentioned this pull request Jan 13, 2025
51 tasks
@lentzi90
Copy link
Contributor

Could we get #11172 merged first?

@adilGhaffarDev
Copy link
Contributor

Could we get #11172 merged first?

/hold
The above PR is required prior to removing this flag.

@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 Jan 14, 2025
@sbueringer
Copy link
Member

Could we get #11172 merged first?

Yup, absolutely. I should get around to 11172 soon

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

@mboersma You probably saw it already, PR is now merged so we can rebase this PR and get it merged as well :)

@mboersma mboersma force-pushed the remove-infra-machine-naming branch from 35b6b0c to db7e7a9 Compare January 22, 2025 14:38
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 22, 2025
@mboersma
Copy link
Contributor Author

/hold cancel

#11172 merged and I rebased this afterward.

@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 Jan 22, 2025
@mboersma mboersma force-pushed the remove-infra-machine-naming branch from db7e7a9 to f54d6f8 Compare January 22, 2025 14:45
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 22, 2025

@mboersma: 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 f54d6f8 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.

@sbueringer
Copy link
Member

Thank you!

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

LGTM label has been added.

Git tree hash: 70cfbcb735bbcc840276229b367cc193abbed150

@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 Jan 22, 2025
@k8s-ci-robot k8s-ci-robot merged commit 556e5d3 into kubernetes-sigs:main Jan 22, 2025
17 of 18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Jan 22, 2025
@mboersma mboersma deleted the remove-infra-machine-naming branch January 22, 2025 20:06
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. area/machineset Issues or PRs related to machinesets area/provider/control-plane-kubeadm Issues or PRs related to KCP 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants