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

Add an explanation of how the kubeadm kubelet dropin file works and a note about cAdvisor #4229

Merged
merged 1 commit into from Jun 30, 2017

Conversation

@luxas
Member

luxas commented Jun 29, 2017

/cc @roberthbailey @jbeda @chenopis @lukemarsden

FYI @dchen1107

This was discussed in kubernetes/release#356. I'm adding some context on how the dropin works and information about how the user might revert kubernetes/release#356 if they have to.


This change is Reviewable

@chenopis

Some minor grammar changes for consistency and markdown formatting issues.

Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
Show outdated Hide outdated docs/admin/kubeadm.md
ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_EXTRA_ARGS
```
A breakdown of what/why:

This comment has been minimized.

@chenopis

chenopis Jun 29, 2017

Contributor

You should change these into an unordered (bulleted) list. Markdown is currently rendering them as a single paragraph, see preview: https://deploy-preview-4229--kubernetes-io-master-staging.netlify.com/docs/admin/kubeadm/

@chenopis

chenopis Jun 29, 2017

Contributor

You should change these into an unordered (bulleted) list. Markdown is currently rendering them as a single paragraph, see preview: https://deploy-preview-4229--kubernetes-io-master-staging.netlify.com/docs/admin/kubeadm/

Show outdated Hide outdated docs/admin/kubeadm.md

@chenopis chenopis changed the base branch from release-1.7 to master Jun 30, 2017

@chenopis chenopis changed the base branch from master to release-1.7 Jun 30, 2017

@chenopis chenopis changed the base branch from release-1.7 to master Jun 30, 2017

@chenopis chenopis changed the base branch from master to release-1.7 Jun 30, 2017

@chenopis

This comment has been minimized.

Show comment
Hide comment
@chenopis

chenopis Jun 30, 2017

Contributor

@luxas Can you rebase this onto master? Now that v1.7 is out, the release-v1.7 branch is closed. Thx

Contributor

chenopis commented Jun 30, 2017

@luxas Can you rebase this onto master? Now that v1.7 is out, the release-v1.7 branch is closed. Thx

@luxas luxas changed the base branch from release-1.7 to master Jun 30, 2017

@luxas

This comment has been minimized.

Show comment
Hide comment
@luxas
Member

luxas commented Jun 30, 2017

@chenopis Done!

@chenopis

unordered list still not rendering correctly; might need a newline before it

Show outdated Hide outdated docs/admin/kubeadm.md
@chenopis

This comment has been minimized.

Show comment
Hide comment
@chenopis

chenopis Jun 30, 2017

Contributor

@luxas I'm going to merge this. Any additional changes can be done in a follow-up PR.

Contributor

chenopis commented Jun 30, 2017

@luxas I'm going to merge this. Any additional changes can be done in a follow-up PR.

@chenopis chenopis merged commit b9f0a5d into kubernetes:master Jun 30, 2017

3 checks passed

cla/linuxfoundation luxas authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details

@chenopis chenopis self-assigned this Aug 30, 2017

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