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.

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

kubeadm: update docs about configuring cgroup driver used by kubelet on control-plane node #20609

Merged
merged 1 commit into from
Apr 28, 2020
Merged

kubeadm: update docs about configuring cgroup driver used by kubelet on control-plane node #20609

merged 1 commit into from
Apr 28, 2020

Conversation

SataQiu
Copy link
Member

@SataQiu SataQiu commented Apr 28, 2020 •
edited
Loading

kubeadm: update docs about configuring cgroup driver used by kubelet on control-plane node
We set the cgroup driver in /var/lib/kubelet/config.yaml instead of /var/lib/kubelet/kubeadm-flags.env now.

Ref: kubernetes/kubernetes#90513
Ref: kubernetes/kubeadm#949

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 28, 2020
@SataQiu
Copy link
Member Author

SataQiu commented Apr 28, 2020

/cc @neolit123

@k8s-ci-robot k8s-ci-robot requested a review from neolit123 April 28, 2020 07:15
@k8s-ci-robot k8s-ci-robot added the language/en Issues or PRs related to English language label Apr 28, 2020
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Apr 28, 2020
@SataQiu SataQiu changed the title kubeadm: update configure cgroup driver used by kubelet on control-plane node docs kubeadm: update docs about configuring cgroup driver used by kubelet on control-plane node Apr 28, 2020
@SataQiu SataQiu force-pushed the update-kubeadm-cgroup-docs-20200428 branch from 3490585 to 975d5f4 Compare April 28, 2020 07:17
@netlify
Copy link

netlify bot commented Apr 28, 2020 •
edited
Loading

Deploy preview for kubernetes-io-master-staging ready!

Built with commit f150906

https://deploy-preview-20609--kubernetes-io-master-staging.netlify.app

neolit123
neolit123 reviewed Apr 28, 2020
View reviewed changes
content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md Outdated
{{< note >}}
Since `--cgroup-driver` flag has been deprecated by kubelet, if you have that in `/var/lib/kubelet/kubeadm-flags.env`
or `/etc/default/kubelet`(`/etc/sysconfig/kubelet` for RPMs), please remove it and set the value via the config file
which used by kubelet (the default is `/var/lib/kubelet/config.yaml`).
Copy link
Member

Choose a reason for hiding this comment

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

please remove it and use the KubeletConfiguration instead (stored in /var/lib/kubelet/config.yaml by default).

neolit123
neolit123 reviewed Apr 28, 2020
View reviewed changes
Copy link
Member

@neolit123 neolit123 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.

thanks @SataQiu i've added one minor comment.

@SataQiu SataQiu force-pushed the update-kubeadm-cgroup-docs-20200428 branch from 975d5f4 to 63e6d45 Compare April 28, 2020 13:33
neolit123
neolit123 reviewed Apr 28, 2020
View reviewed changes
content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md Outdated
{{< note >}}
Since `--cgroup-driver` flag has been deprecated by kubelet, if you have that in `/var/lib/kubelet/kubeadm-flags.env`
or `/etc/default/kubelet`(`/etc/sysconfig/kubelet` for RPMs), please remove it and use the KubeletConfiguration instead
(stored in /var/lib/kubelet/config.yaml by default).
Copy link
Member

@neolit123 neolit123 Apr 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

/var/lib/kubelet/config.yaml should be in back-quotes (code quotes ` )

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @neolit123 😆

@SataQiu SataQiu force-pushed the update-kubeadm-cgroup-docs-20200428 branch from 63e6d45 to f150906 Compare April 28, 2020 13:42
@neolit123
Copy link
Member

/lgtm
/assign @tengqm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2020
@sftim
Copy link
Contributor

sftim commented Apr 28, 2020

/sig cluster-lifecycle
/approve

@k8s-ci-robot k8s-ci-robot added the sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. label Apr 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

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 Apr 28, 2020
@k8s-ci-robot k8s-ci-robot merged commit 717a650 into kubernetes:master Apr 28, 2020
@lethargosapatheia
Copy link

I'm not sure what has been changed here, but it does sound that this part of the documentation (external HA cluster) should also be included:
https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm/
Here --cgroup-driver is still used in the command line.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@sftim sftim Awaiting requested review from sftim

@xiangpengzhao xiangpengzhao Awaiting requested review from xiangpengzhao

Assignees

@neolit123 neolit123

@tengqm tengqm

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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@SataQiu @neolit123 @sftim @k8s-ci-robot @lethargosapatheia @tengqm