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

remove doc from kubeadm-init.md which is duplicated in kubelet-integration.md #15424

Merged
merged 9 commits into from
Jul 28, 2019
Merged

remove doc from kubeadm-init.md which is duplicated in kubelet-integration.md #15424

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
279426e
remove doc from kubeadm-init.md which is duplicated in kubelet-integr…
vorburger Jul 14, 2019
f128ce7
shorten link re. removed doc from kubeadm-init.md
vorburger Jul 15, 2019
95e4f28
drop https://kubernetes.io from link in kubeadm-init.md
vorburger Jul 15, 2019
c5db550
Revert "shorten link re. removed doc from kubeadm-init.md"
vorburger Jul 19, 2019
9ee2380
fix bad wording
vorburger Jul 19, 2019
e7a9505
Merge branch 'master' into patch-11
vorburger Jul 23, 2019
9fca48b
update kubeadm-init.md based on kbhawkey review feedback
vorburger Jul 26, 2019
1fb1f64
Merge branch 'master' into patch-11
vorburger Jul 26, 2019
52ac5dc
remove duplicate sentence in kubeadm-init.md
vorburger Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop https://kubernetes.io from link in kubeadm-init.md
  • Loading branch information
@vorburger
vorburger authored Jul 15, 2019
commit 95e4f28f916f1a7a6da95bc8407af7375c1dbe05
2 changes: 1 addition & 1 deletion content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
vorburger marked this conversation as resolved.
Show resolved Hide resolved

### Use kubeadm with CRI runtimes

Expand Down