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

⚠️ Default Kubelet cgroupDriver to systemd for Kubernetes >= 1.21 #4294

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
back port of #4236

For Kubernetes >= 1.21, image builder is going to setup containerd for using systemd cgroup.
KCP should take care of adapting the Kubelet-Config map to be consistent with this change.

Which issue(s) this PR fixes:
Rif #4099

/area control-plane
/milestone v0.3.x

@k8s-ci-robot k8s-ci-robot added this to the v0.3.x milestone Mar 11, 2021
@k8s-ci-robot k8s-ci-robot added area/control-plane Issues or PRs related to control-plane lifecycle management cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 11, 2021
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 11, 2021
@neolit123
Copy link
Member

neolit123 commented Mar 11, 2021

technically, the CAPI change is not needed as long as kubeadm init from 1.21 defaults the KubeletConfiguration that it uploads in the cluster to have the systemd driver. if kubeadm is doing that it will match the image-builder driver and i don't see a need for CAPI to do that too?

maybe this code path is done during upgrade, where an old config map has to be migrated to match the image builder driver?

@fabriziopandini
Copy link
Member Author

maybe this code path is done during upgrade, where an old config map has to be migrated to match the image builder driver?

this is the case

WRT to the minor fix, given this is a backport I prefer keep things consistent; eventually we can fix in main and backport those nits well

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/assign @neolit123
for lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 Mar 12, 2021
@vincepri
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 16, 2021
@vincepri
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit a554383 into kubernetes-sigs:release-0.3 Mar 16, 2021
@fabriziopandini fabriziopandini deleted the default-cgroupDriver-to-systemd-for-1.21 branch March 17, 2021 09:09
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/control-plane Issues or PRs related to control-plane lifecycle management 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.

4 participants