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

Feat: kubeadm v1beta4 support #11674

Merged
merged 6 commits into from
Nov 8, 2024

Conversation

tico88612
Copy link
Member

What type of PR is this?

/kind feature

What this PR does / why we need it:

Starting from Kubernetes v1.31, kubeadm v1beta4 is supported, and all subsequent versions use v1beta4 for deploying clusters.

Which issue(s) this PR fixes:

Fixes #10935

Special notes for your reviewer:

This is currently a draft PR, and the changes may conflict with #11633, so #11633 needs to be reviewed first.

Does this PR introduce a user-facing change?:

Feat: Kubeadm config API support v1beta4

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Oct 29, 2024
@k8s-ci-robot
Copy link
Contributor

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 29, 2024
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 29, 2024
Copy link
Contributor

@VannTen VannTen left a comment

Choose a reason for hiding this comment

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

Some comments/suggestions.

If kube_version is v1.31 or higher, it will be v1beta4, otherwise it
will be v1beta3.

Signed-off-by: ChengHao Yang <[email protected]>
@tico88612 tico88612 force-pushed the feat/kubeadm-v1beta4 branch from d12a89c to 9188cf6 Compare November 5, 2024 13:12
@tico88612
Copy link
Member Author

/label tide/merge-method-merge
/ok-to-test

@k8s-ci-robot k8s-ci-robot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. labels Nov 5, 2024
@tico88612 tico88612 marked this pull request as ready for review November 5, 2024 13:13
@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 Nov 5, 2024
@tico88612
Copy link
Member Author

/retest

1 similar comment
@tico88612
Copy link
Member Author

/retest

@tico88612 tico88612 force-pushed the feat/kubeadm-v1beta4 branch from 9188cf6 to 9682baf Compare November 5, 2024 15:20
v1beta4 has changed a lot in this file (e.g. ExtraArgs etc.), so it was implemented in separate files.

Signed-off-by: ChengHao Yang <[email protected]>
I added the kubeadm_config_api_version variable in the previous commit,
and remove kubeadm api version condition.

Signed-off-by: ChengHao Yang <[email protected]>
Remove kubeadm api version condition.
Currently there is not much difference between the files, if there are more changes in the future,
please use different files to distinguish them (you can use the kubeadm_config_api_version variable)

Signed-off-by: ChengHao Yang <[email protected]>
Currently there is not much difference between the files, if there are more changes in the future,
please use different files to distinguish them (you can use the kubeadm_config_api_version variable)

Signed-off-by: ChengHao Yang <[email protected]>
Currently there is not much difference between the files, if there are more changes in the future,
please use different files to distinguish them (you can use the kubeadm_config_api_version variable)

Signed-off-by: ChengHao Yang <[email protected]>
@tico88612 tico88612 force-pushed the feat/kubeadm-v1beta4 branch from 9682baf to bf01b73 Compare November 5, 2024 15:36
@VannTen
Copy link
Contributor

VannTen commented Nov 8, 2024

Looking at that diff makes me think we should definitely not template it this way but juste mostly mirror the data struct and feed it to to_yaml, but oh well, one more TODO 😆

/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 Nov 8, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tico88612, VannTen

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 Nov 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 91a77e4 into kubernetes-sigs:master Nov 8, 2024
40 checks passed
@tico88612 tico88612 deleted the feat/kubeadm-v1beta4 branch November 26, 2024 01:22
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for kubeadm Configuration (v1beta4)
4 participants