Skip to content

porting some information from kubeadm-init.md to kubelet-integration.md#15423

Merged
k8s-ci-robot merged 4 commits intokubernetes:masterfrom
vorburger:patch-10
Aug 6, 2019
Merged

porting some information from kubeadm-init.md to kubelet-integration.md#15423
k8s-ci-robot merged 4 commits intokubernetes:masterfrom
vorburger:patch-10

Conversation

@vorburger
Copy link
Copy Markdown
Contributor

@vorburger vorburger commented Jul 14, 2019 •
edited
Loading

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 kubernetes/kubernetes#80136

@vorburger
porting some information from kubeadm-init.md to kubelet-integration.…
15ab10b 
…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
@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 Jul 14, 2019
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jul 14, 2019
vorburger added a commit to vorburger/kubernetes.github.io that referenced this pull request Jul 14, 2019
@vorburger
remove doc from kubeadm-init.md which is duplicated in kubelet-integr…
279426e 
…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).
@netlify
Copy link
Copy Markdown

netlify bot commented Jul 14, 2019 •
edited
Loading

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

Built with commit 3dba314

https://deploy-preview-15423--kubernetes-io-master-staging.netlify.com

@vorburger vorburger mentioned this pull request Jul 14, 2019
Merged
neolit123
neolit123 reviewed Jul 16, 2019
View reviewed changes
Copy link
Copy Markdown
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 for the PR.
please remove quotes around project names, such as kubeadm, kubelet, systemd.
quotes should be used if we are talking about a binary. k/website is not very consistent in this regard.

@vorburger
Copy link
Copy Markdown
Contributor Author

vorburger commented Jul 16, 2019

@neolit123 Please use GitHub's cool suggest a specific change (Pt. 6) feature - instead of describing the change requested in words, just click that Icon before the aA B which let's you kind of "inline edit" and counter propose. It's easier because faster for both the reviewer (you) and the Pull Request author (me) to "parse" and easily accept.

@neolit123
Copy link
Copy Markdown
Member

neolit123 commented Jul 16, 2019

@vorburger i know how the feature works. :) i'm leaving the edits to you.

@vorburger
Copy link
Copy Markdown
Contributor Author

vorburger commented Jul 23, 2019

@vorburger i know how the feature works. :) i'm leaving the edits to you.

done. LGTY now?

neolit123
neolit123 reviewed Jul 23, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

using the new feature to correct a couple of quotes.

@vorburger @neolit123
Update content/en/docs/setup/production-environment/tools/kubeadm/kub…
3dba314 
…elet-integration.md

Co-Authored-By: Lubomir I. Ivanov <neolit123@gmail.com>
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 26, 2019
@vorburger
Copy link
Copy Markdown
Contributor Author

vorburger commented Jul 26, 2019

Can I do anything else to help finally get this merged?

/assign @tfogo

k8s-ci-robot pushed a commit that referenced this pull request Jul 28, 2019
@vorburger @k8s-ci-robot
remove doc from kubeadm-init.md which is duplicated in kubelet-integr…
f218797 
…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
@vorburger
Copy link
Copy Markdown
Contributor Author

vorburger commented Aug 2, 2019

Can I do anything else to help get this merged?

@zacharysarah
Copy link
Copy Markdown
Contributor

zacharysarah commented Aug 5, 2019

Leaving final /lgtm to @neolit123. 👋

/approve

@zacharysarah
Copy link
Copy Markdown
Contributor

zacharysarah commented Aug 5, 2019

/unassign @tfogo
/assign @neolit123

@k8s-ci-robot k8s-ci-robot assigned neolit123 and unassigned tfogo Aug 5, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Aug 5, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Aug 5, 2019
neolit123
neolit123 reviewed Aug 6, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

https://github.com/kubernetes/kubernetes/blob/master/build/ might actually change in the near future due to the work SIG Release's new engineering team are doing, so ideally we don't want to have the same wrong link in multiple locations.

but let's revise this once/if that refactor actually happens. thanks.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 6, 2019
@k8s-ci-robot k8s-ci-robot merged commit da9db0b into kubernetes:master Aug 6, 2019
wahyuoi pushed a commit to wahyuoi/website that referenced this pull request Sep 9, 2019
@vorburger @neolit123 @wahyuoi
porting some information from kubeadm-init.md to kubelet-integration.…
affc11b 
…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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rajakavitha1 Rajakavitha1 Awaiting requested review from Rajakavitha1

@xiangpengzhao xiangpengzhao Awaiting requested review from xiangpengzhao

2 more reviewers

@neolit123 neolit123 neolit123 left review comments

@sftim sftim sftim left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@neolit123 neolit123

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/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vorburger @neolit123 @zacharysarah @k8s-ci-robot @sftim @tfogo