remove doc from kubeadm-init.md which is duplicated in kubelet-integration.md#15424
Merged
k8s-ci-robot merged 9 commits intokubernetes:masterfrom Jul 28, 2019
Merged
remove doc from kubeadm-init.md which is duplicated in kubelet-integration.md#15424k8s-ci-robot merged 9 commits intokubernetes:masterfrom
k8s-ci-robot merged 9 commits intokubernetes:masterfrom
Conversation
…ation.md This section in reference/setup-tools/kubeadm/kubeadm-init.md seems to significantly overlap with setup/production-environment/tools/kubeadm/kubelet-integration.md - looks like someone copy/pasted it at some point? The information in kubelet-integration.md looks more up to date than this (e.g. there actually is no `--allow-privileged=true` or `--network-plugin=cni` here?). Therefore lets delete the sections content, and have a short line linking to the other one. If this is accepted, then kubernetes#15421 is moot (because kubernetes#15423 moves it to the new place).
|
Deploy preview for kubernetes-io-master-staging ready! Built with commit 52ac5dc https://deploy-preview-15424--kubernetes-io-master-staging.netlify.com |
as requested in kubernetes#15424 review
neolit123
reviewed
Jul 15, 2019
Contributor
kbhawkey
reviewed
Jul 18, 2019
Member
|
Prs first pass a tech review, but the approvers from sig-docs may request
further changes in terms of style and copy edits.
…On Jul 19, 2019 19:24, "Michael Vorburger ⛑️" ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
<#15424 (comment)>:
> @@ -206,7 +206,7 @@ point to the CA certificate and key.
### Managing the kubeadm drop-in file for the kubelet {#kubelet-drop-in}
-See [here](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/kubelet-integration/#the-kubelet-drop-in-file-for-systemd) for details on the `kubeadm` integration with the `kubelet`.
+See [here](/docs/setup/production-environment/tools/kubeadm/kubelet-integration/#the-kubelet-drop-in-file-for-systemd) for details on the `kubeadm` integration with the `kubelet`.
@kbhawkey <https://github.com/kbhawkey> so I had it like that in f128ce7
<f128ce7>
because I agree that's better style but then @neolit123
<https://github.com/neolit123> asked for it to be changed to "here"
linked in his review 4 days ago above (expand Outdated Show Resolved) so
how to play this game here - who's right? 😺 I also prefer it how I
initially had it - @neolit123 <https://github.com/neolit123> will you
agree to me reverting what you had asked for?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#15424?email_source=notifications&email_token=AACRATA5QPQ3ETXOTRQFELDQAHTDHA5CNFSM4IDN7B22YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB7AQZXA#discussion_r305430899>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AACRATDU5WDIXZVZGT3TWR3QAHTDHANCNFSM4IDN7B2Q>
.
|
This reverts commit f128ce7.
Contributor
Author
|
Can I do anything else to help get this merged? /assign @ryanmcginnis |
Contributor
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ryanmcginnis The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kbhawkey
reviewed
Jul 26, 2019
kbhawkey
reviewed
Jul 26, 2019
Contributor
|
/lgtm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This section in reference/setup-tools/kubeadm/kubeadm-init.md seems to significantly overlap with setup/production-environment/tools/kubeadm/kubelet-integration.md - looks like someone copy/pasted it at some point? The information in kubelet-integration.md looks more up to date than this (e.g. there actually is no
--allow-privileged=trueor--network-plugin=cnihere?). Therefore lets delete the sections content, and have a short line linking to the other one.If this is accepted, then #15421 is moot (because #15423 moves it to the new place).