Skip to content

Feat: kubeadm v1beta4 support#11674

Merged
k8s-ci-robot merged 6 commits intokubernetes-sigs:masterfrom
tico88612:feat/kubeadm-v1beta4
Nov 8, 2024
Merged

Feat: kubeadm v1beta4 support#11674
k8s-ci-robot merged 6 commits intokubernetes-sigs:masterfrom
tico88612:feat/kubeadm-v1beta4

Conversation

@tico88612
Copy link
Copy Markdown
Member

@tico88612 tico88612 commented Oct 29, 2024

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
Copy Markdown
Contributor

k8s-ci-robot commented Oct 29, 2024

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
VannTen
VannTen reviewed Oct 31, 2024
View reviewed changes
Copy link
Copy Markdown
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.

@tico88612
Feat: add kubeadm_config_api_version default variable
9b7d285 
If kube_version is v1.31 or higher, it will be v1beta4, otherwise it
will be v1beta3.

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
@tico88612 tico88612 force-pushed the feat/kubeadm-v1beta4 branch from d12a89c to 9188cf6 Compare November 5, 2024 13:12
@tico88612
Copy link
Copy Markdown
Member Author

tico88612 commented Nov 5, 2024

/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
Copy Markdown
Member Author

tico88612 commented Nov 5, 2024

/retest

1 similar comment
@tico88612
Copy link
Copy Markdown
Member Author

tico88612 commented Nov 5, 2024

/retest

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

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
@tico88612
Refactor: use kubeadm_config_api_version variable
5929935 
I added the kubeadm_config_api_version variable in the previous commit,
and remove kubeadm api version condition.

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
@tico88612
Feat: add kubeadm-client.conf support v1beta4
53e5d8b 
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 <17496418+tico88612@users.noreply.github.com>
@tico88612
Feat: add kubeadm-controlplane.yaml support v1beta4
1ec6711 
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 <17496418+tico88612@users.noreply.github.com>
@tico88612
Feat: kubeadm images download support v1beta4
bf01b73 
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 <17496418+tico88612@users.noreply.github.com>
@tico88612 tico88612 force-pushed the feat/kubeadm-v1beta4 branch from 9682baf to bf01b73 Compare November 5, 2024 15:36
@VannTen
Copy link
Copy Markdown
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
Copy Markdown
Contributor

k8s-ci-robot commented Nov 8, 2024

[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

Details 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
@agravgaard agravgaard mentioned this pull request Nov 10, 2024
Merged
@VannTen VannTen mentioned this pull request Nov 14, 2024
Merged
@tico88612 tico88612 deleted the feat/kubeadm-v1beta4 branch November 26, 2024 01:22
@yckaolalala yckaolalala mentioned this pull request Nov 27, 2024
Closed
@tico88612 tico88612 mentioned this pull request Nov 27, 2024
Closed
chadswen added a commit to chadswen/kargo that referenced this pull request Mar 3, 2025
@chadswen
Refactor control plane upgrades with reconfiguration support
4c93b93 
Adds revised support for:
- The previously removed `--config` argument for `kubeadm upgrade apply`
- Changes to `ClusterConfiguration` as part of the `upgrade-cluster.yml` playbook lifecycle (Fixes kubernetes-sigs#11552)
- kubeadm-config `v1beta4` `UpgradeConfiguration` for the `kubeadm upgrade apply` command: [UpgradeConfiguration v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-UpgradeConfiguration).

Background:
PR kubernetes-sigs#11352 removed the --config flag from `kubeadm upgrade apply` to address the upgrade issues with kubeadm v1.30 identified in kubernetes-sigs#11350. Before this change, kubespray upgrades depended on `kubeadm upgrade apply --config=...` to make ClusterConfiguration changes with the upgrade. However, this reconfiguration was deprecated in `kubeadm upgrade apply` some time ago, and is no longer supported by the `kubeadm upgrade apply` config command.

To ensure `ClusterConfiguration` changes are still applied during upgrades in a supportable way, the new solution in this PR reconfigures ClusterConfiguration separately after upgrade with distinct upload-config and control plane static pod rewrite tasks that run immediately after a successful upgrade. See [this comment from @VannTen](kubernetes-sigs#11871 (comment)) for more discussion on why the expectation is to fix reconfiguration as part of the upgrade lifecycle, as well as issue kubernetes-sigs#11552.

Additionally, kubeadm v1.31 added back support for `--config`, along with UpgradeConfiguration when using v1beta4. This PR adds support for the `UpgradeConfiguration` in the kubeadm-config file, which is required to fully implement upgrades with `kubeadm.k8s.io/v1beta4`. This addition was omitted from the original v1beta4 implementation in kubernetes-sigs#11674, but it is required to use `--config` correctly during kubeadm upgrades with v1beta4.
@chadswen chadswen mentioned this pull request Mar 3, 2025
Merged
chadswen added a commit to chadswen/kargo that referenced this pull request Mar 3, 2025
@chadswen
Refactor control plane upgrades with reconfiguration support
eeca17e 
Adds revised support for:
- The previously removed `--config` argument for `kubeadm upgrade apply`
- Changes to `ClusterConfiguration` as part of the `upgrade-cluster.yml` playbook lifecycle (Fixes kubernetes-sigs#11552)
- kubeadm-config `v1beta4` `UpgradeConfiguration` for the `kubeadm upgrade apply` command: [UpgradeConfiguration v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-UpgradeConfiguration).

kubeadm upgrade apply --config support
PR kubernetes-sigs#11352 removed the --config flag from all usages of `kubeadm upgrade apply` to address the upgrade issues with kubeadm v1.30 identified in kubernetes-sigs#11350.

This PR enables support for the scenarios in which `--config` can and should still be used with `kubeadm upgrade apply`, with some version specific handling that still avoid kubeadm v1.30's upgrade failures.

Control plane reconfiguration during upgrade
Before PR kubernetes-sigs#11352, kubespray upgrades depended on `kubeadm upgrade apply --config=...` to make ClusterConfiguration changes during a cluster upgrade. However, this reconfiguration was deprecated from `kubeadm upgrade apply` some time ago, and is [no longer supported](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/#additional-information) by the `kubeadm upgrade apply` command.

To ensure `ClusterConfiguration` changes are still applied during upgrades in a supportable way, the new solution in this PR reconfigures `ClusterConfiguration` separately with distinct `kubeadm init phase upload-config kubeadm --config=...` and control plane static pod rewrite tasks that run immediately after a successful upgrade. See [this comment from @VannTen](kubernetes-sigs#11871 (comment)) for more discussion on why the expectation is to fix reconfiguration as part of the upgrade lifecycle, as well as issue kubernetes-sigs#11552. This approach is in line with kubeadm's [recommendations for cluster reconfiguration](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-reconfigure/).

kubeadm-config v1beta4 `UpgradeApplyConfiguration` support
Additionally, kubeadm v1.31 added back support for `--config` while introducing support for `UpgradeConfiguration` in the kubeadm-config file, which is required to fully implement upgrades with `kubeadm.k8s.io/v1beta4`. UpgradeConfiguration was not added in kubespray's initial v1beta4 implementation (PR kubernetes-sigs#11674), but it is required to use `--config` correctly during kubeadm upgrades with v1beta4.

This PR uses UpgradeConfiguration for v1beta4 kubeadm upgrades, while still retaining support for v1beta3.
chadswen added a commit to chadswen/kargo that referenced this pull request Mar 3, 2025
@chadswen
Refactor control plane upgrades with reconfiguration support
c8770da 
Adds revised support for:
- The previously removed `--config` argument for `kubeadm upgrade apply`
- Changes to `ClusterConfiguration` as part of the `upgrade-cluster.yml` playbook lifecycle
- kubeadm-config `v1beta4` `UpgradeConfiguration` for the `kubeadm upgrade apply` command: [UpgradeConfiguration v1beta4](https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-UpgradeConfiguration).

kubeadm upgrade apply --config support
PR kubernetes-sigs#11352 removed the --config flag from all usages of `kubeadm upgrade apply` to address the upgrade issues with kubeadm v1.30 identified in kubernetes-sigs#11350.

This PR enables support for the scenarios in which `--config` can and should still be used with `kubeadm upgrade apply`, with some version specific handling that still avoid kubeadm v1.30's upgrade failures.

Control plane reconfiguration during upgrade
Before PR kubernetes-sigs#11352, kubespray upgrades depended on `kubeadm upgrade apply --config=...` to make ClusterConfiguration changes during a cluster upgrade. However, this reconfiguration was deprecated from `kubeadm upgrade apply` some time ago, and is [no longer supported](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/#additional-information) by the `kubeadm upgrade apply` command.

To ensure `ClusterConfiguration` changes are still applied during upgrades in a supportable way, the new solution in this PR reconfigures `ClusterConfiguration` separately with distinct `kubeadm init phase upload-config kubeadm --config=...` and control plane static pod rewrite tasks that run immediately after a successful upgrade. See [this comment from @VannTen](kubernetes-sigs#11871 (comment)) for more discussion on why the expectation is to fix reconfiguration as part of the upgrade lifecycle, as well as issue kubernetes-sigs#11552. This approach is in line with kubeadm's [recommendations for cluster reconfiguration](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-reconfigure/).

kubeadm-config v1beta4 `UpgradeApplyConfiguration` support
Additionally, kubeadm v1.31 added back support for `--config` while introducing support for `UpgradeConfiguration` in the kubeadm-config file, which is required to fully implement upgrades with `kubeadm.k8s.io/v1beta4`. UpgradeConfiguration was not added in kubespray's initial v1beta4 implementation (PR kubernetes-sigs#11674), but it is required to use `--config` correctly during kubeadm upgrades with v1beta4.

This PR uses UpgradeConfiguration for v1beta4 kubeadm upgrades, while still retaining support for v1beta3.
@VannTen VannTen mentioned this pull request Feb 17, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yankay yankay yankay left review comments

@ErikJiang ErikJiang Awaiting requested review from ErikJiang

@mzaian mzaian Awaiting requested review from mzaian

@VannTen VannTen Awaiting requested review from VannTen

Assignees

@VannTen VannTen

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add support for kubeadm Configuration (v1beta4)

4 participants

@tico88612 @k8s-ci-robot @VannTen @yankay