github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65123 from tengqm/kubeadm-doc-typo-1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 65123, 65176, 65139, 65084, 65056). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix a typo in kubeadm generated doc

Fix a typo in kubeadm comment that leads to confusing docs generated.

```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue
2018-06-21 16:56:07 -07:00
committed by GitHub
parent ee7e59b756 e41629ce7f
commit 265b9ef209
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/phases/addons.go
View File

@@ -39,12 +39,12 @@ import (
var ( var (
allAddonsLongDesc = normalizer.LongDesc(` allAddonsLongDesc = normalizer.LongDesc(`
Installs the CoreDNS and the kube-proxys addons components via the API server. Installs the CoreDNS and the kube-proxy addons components via the API server.
Please note that although the DNS server is deployed, it will not be scheduled until CNI is installed. Please note that although the DNS server is deployed, it will not be scheduled until CNI is installed.
` + cmdutil.AlphaDisclaimer) ` + cmdutil.AlphaDisclaimer)
allAddonsExample = normalizer.Examples(` allAddonsExample = normalizer.Examples(`
# Installs the CoreDNS and the kube-proxys addons components via the API server, # Installs the CoreDNS and the kube-proxy addons components via the API server,
# functionally equivalent to what installed by kubeadm init. # functionally equivalent to what installed by kubeadm init.
kubeadm alpha phase selfhosting from-staticpods kubeadm alpha phase selfhosting from-staticpods