github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13840 from nelcy/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-28 23:55:32 -08:00
parent 03b3b61565 fa76de79e5
commit fec5206f1a
47 changed files with 40874 additions and 37685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/admin/kubelet.md
View File

@@ -139,9 +139,10 @@ kubelet
--system-container="": Optional resource-only container in which to place all non-kernel processes that are not already in a container. Empty for no container. Rolling back the flag requires a reboot. (Default: "").
--tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir.
--tls-private-key-file="": File containing x509 private key matching --tls-cert-file.
--volume-plugin-dir="/usr/libexec/kubernetes/kubelet-plugins/volume/exec/": <Warning: Alpha feature> The full path of the directory in which to search for additional third party volume plugins
```
###### Auto generated by spf13/cobra on 8-Dec-2015
###### Auto generated by spf13/cobra on 11-Dec-2015
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->