Merge branch 'master' into release-1.8

2017-09-22 12:57:53 -07:00
parent 96a4aa7a3e 8f9677227d
commit 29a7b6df2e
17 changed files with 481 additions and 72 deletions
@@ -205,7 +205,6 @@ register itself with the API server.  This is the preferred pattern, used by mos

 For self-registration, the kubelet is started with the following options:

-  - `--api-servers` - Location of the apiservers.
  - `--kubeconfig` - Path to credentials to authenticate itself to the apiserver.
  - `--cloud-provider` - How to talk to a cloud provider to read metadata about itself.
  - `--register-node` - Automatically register with the API server.