clarify better where 10-kubeadm.conf comes from in kubeadm/kubeadm-init.md#15421
Merged
k8s-ci-robot merged 2 commits intokubernetes:masterfrom Jul 21, 2019
Merged
clarify better where 10-kubeadm.conf comes from in kubeadm/kubeadm-init.md#15421k8s-ci-robot merged 2 commits intokubernetes:masterfrom
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
Conversation
vorburger
added a commit
to vorburger/kubernetes.github.io
that referenced
this pull request
Jul 14, 2019
…md doc from reference/setup-tools/kubeadm/kubeadm-init.md to setup/production-environment/tools/kubeadm/kubelet-integration.md includes edits I just proposed in kubernetes#15421 and #80136
|
Deploy preview for kubernetes-io-master-staging ready! Built with commit ed8f92c https://deploy-preview-15421--kubernetes-io-master-staging.netlify.com |
vorburger
added a commit
to vorburger/kubernetes.github.io
that referenced
this pull request
Jul 14, 2019
…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).
Contributor
Author
|
I would Close this PR to Abandon it (unmerged) if/when #15424 is merged. |
poothia
reviewed
Jul 18, 2019
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tengqm 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 |
k8s-ci-robot
pushed a commit
that referenced
this pull request
Jul 28, 2019
…ation.md (#15424) * remove doc from kubeadm-init.md which is duplicated in kubelet-integration.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 #15421 is moot (because #15423 moves it to the new place). * shorten link re. removed doc from kubeadm-init.md as requested in #15424 review * drop https://kubernetes.io from link in kubeadm-init.md * Revert "shorten link re. removed doc from kubeadm-init.md" This reverts commit f128ce7. * fix bad wording * update kubeadm-init.md based on kbhawkey review feedback * remove duplicate sentence in kubeadm-init.md
k8s-ci-robot
pushed a commit
that referenced
this pull request
Aug 6, 2019
…md (#15423) * porting some information from kubeadm-init.md to kubelet-integration.md doc from reference/setup-tools/kubeadm/kubeadm-init.md to setup/production-environment/tools/kubeadm/kubelet-integration.md includes edits I just proposed in #15421 and #80136 * improve wording re. systemd in kubelet-integration.md * removing quotes and adding the in kubelet-integration.md * Update content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md Co-Authored-By: Lubomir I. Ivanov <neolit123@gmail.com>
wahyuoi
pushed a commit
to wahyuoi/website
that referenced
this pull request
Sep 9, 2019
…md (kubernetes#15423) * porting some information from kubeadm-init.md to kubelet-integration.md doc from reference/setup-tools/kubeadm/kubeadm-init.md to setup/production-environment/tools/kubeadm/kubelet-integration.md includes edits I just proposed in kubernetes#15421 and #80136 * improve wording re. systemd in kubelet-integration.md * removing quotes and adding the in kubelet-integration.md * Update content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md Co-Authored-By: Lubomir I. Ivanov <neolit123@gmail.com>
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
4 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.
No description provided.