whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into release-1.6

Browse Source
This commit is contained in:
Devin Donnelly
2017-03-13 17:00:40 -07:00
parent 3be8f7493a 151f2968ba
commit b9c2e95fee
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/node.md
+3 -3
View File
@@ -172,9 +172,9 @@ 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: For self-registration, the kubelet is started with the following options:
- `--api-servers=` - Location of the apiservers. - `--api-servers` - Location of the apiservers.
- `--kubeconfig=` - Path to credentials to authenticate itself to the apiserver. - `--kubeconfig` - Path to credentials to authenticate itself to the apiserver.
- `--cloud-provider=` - How to talk to a cloud provider to read metadata about itself. - `--cloud-provider` - How to talk to a cloud provider to read metadata about itself.
- `--register-node` - Automatically register with the API server. - `--register-node` - Automatically register with the API server.
- `--node-ip` IP address of the node. - `--node-ip` IP address of the node.
- `--node-labels` - Labels to add when registering the node in the cluster. - `--node-labels` - Labels to add when registering the node in the cluster.
docs/admin/out-of-resource.md
+1 -1
View File
@@ -35,7 +35,7 @@ summary API.
| `imagefs.available` | `imagefs.available` := `node.stats.runtime.imagefs.available` | | `imagefs.available` | `imagefs.available` := `node.stats.runtime.imagefs.available` |
| `imagefs.inodesFree` | `imagefs.inodesFree` := `node.stats.runtime.imagefs.inodesFree` | | `imagefs.inodesFree` | `imagefs.inodesFree` := `node.stats.runtime.imagefs.inodesFree` |
Each of the above signals support either a literal or percentage based value. The percentage based value Each of the above signals supports either a literal or percentage based value. The percentage based value
is calculated relative to the total capacity associated with each signal. is calculated relative to the total capacity associated with each signal.
`kubelet` supports only two filesystem partitions. `kubelet` supports only two filesystem partitions.