Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 3/17/21

Browse Source

Fixed merge conflict with /docs/reference/command-line-tools-reference/kube-apiserver.md and preferred master

...

This commit is contained in:

Rey Lejano

2021-03-17 21:29:04 -07:00

parent 7afd404212 cb7edbf398

commit 9d56683e8b

60 changed files with 1705 additions and 698 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

content/en/docs/reference/command-line-tools-reference/kube-apiserver.md

+199 -186

File diff suppressed because one or more lines are too long

content/en/docs/reference/command-line-tools-reference/kube-controller-manager.md

+172 -159

File diff suppressed because one or more lines are too long

content/en/docs/reference/command-line-tools-reference/kube-proxy.md

+62 -49

File diff suppressed because one or more lines are too long

content/en/docs/reference/command-line-tools-reference/kube-scheduler.md

+99 -86

File diff suppressed because one or more lines are too long