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

Signed-off-by: Ziqi Zhao <zhaoziqi@qiniu.com> (#5909)

Browse Source 
Fix typos and one mistake of document /docs/admin/kubeadm
This commit is contained in:
Ziqi Zhao
2017-10-13 15:17:22 -05:00
committed by Steve Perry
parent 2940069560
commit 61ae72a3ae
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/kubeadm.md
+7 -7
View File
@@ -52,7 +52,7 @@ following steps:
1. kubeadm "labels" and "taints" the master node so that only control plane 1. kubeadm "labels" and "taints" the master node so that only control plane
components will run there. components will run there.
1. Kubeadm makes all the necessary configurations for allowing node joining with the 1. kubeadm makes all the necessary configurations for allowing node joining with the
[Bootstrap Tokens](https://kubernetes.io/docs/admin/bootstrap-tokens/) and [Bootstrap Tokens](https://kubernetes.io/docs/admin/bootstrap-tokens/) and
[TLS Bootstrap](https://kubernetes.io/docs/admin/kubelet-tls-bootstrapping/) [TLS Bootstrap](https://kubernetes.io/docs/admin/kubelet-tls-bootstrapping/)
mechanism: mechanism:
@@ -88,7 +88,7 @@ steps:
with the Kubernetes Master to submit a certificate signing request (CSR); by with the Kubernetes Master to submit a certificate signing request (CSR); by
default the control plane will sign this CSR request automatically. default the control plane will sign this CSR request automatically.
1. Finally, kubeadm will configures the local kubelet to connect to the API 1. Finally, kubeadm will configure the local kubelet to connect to the API
server with the definitive identity assigned to the node. server with the definitive identity assigned to the node.
## Usage ## Usage
@@ -192,7 +192,7 @@ flags that can be used to customise the Kubernetes installation.
- `--service-cidr` (default '10.96.0.0/12') - `--service-cidr` (default '10.96.0.0/12')
You can use the `--service-cidr` flag to override the subnet Kubernetes uses to You can use the `--service-cidr` flag to override the subnet Kubernetes uses to
assign pods IP addresses. If you do, you will also need to update the assign services IP addresses. If you do, you will also need to update the
`/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` file to reflect this `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` file to reflect this
change else DNS will not function correctly. change else DNS will not function correctly.
@@ -489,7 +489,7 @@ at the cost of some usability.
### Turning off auto-approval of Node Client Certificates ### Turning off auto-approval of Node Client Certificates
By default, there is an CSR auto-approver enabled that basically approves any client certificate request By default, there is a CSR auto-approver enabled that basically approves any client certificate request
for a kubelet when a Bootstrap Token was used when authenticating. If you don't want the cluster to for a kubelet when a Bootstrap Token was used when authenticating. If you don't want the cluster to
automatically approve kubelet client certs, you can turn it off by executing this command: automatically approve kubelet client certs, you can turn it off by executing this command:
@@ -541,13 +541,13 @@ users: []
You can then use the `cluster-info.yaml` file as an argument to `kubeadm join --discovery-file`. You can then use the `cluster-info.yaml` file as an argument to `kubeadm join --discovery-file`.
Turning of public access to the `cluster-info` ConfigMap: Turning off public access to the `cluster-info` ConfigMap:
```console ```console
$ kubectl -n kube-public delete rolebinding kubeadm:bootstrap-signer-clusterinfo $ kubectl -n kube-public delete rolebinding kubeadm:bootstrap-signer-clusterinfo
``` ```
These command should be run after `kubeadm init` but before `kubeadm join`. These commands should be run after `kubeadm init` but before `kubeadm join`.
## Managing Tokens {#manage-tokens} ## Managing Tokens {#manage-tokens}
@@ -752,7 +752,7 @@ This behaviour can be overridden by [using kubeadm with a configuration file](#c
Allowed customization are: Allowed customization are:
- provide an alternative `imageRepository` to be used instead of - provide an alternative `imageRepository` to be used instead of
`gcr.io/google_containers` (NB. does not works for ci version) `gcr.io/google_containers` (NB. does not works for ci version)
- provide an `unifiedControlPlaneImage` to be used instead of single images - provide an `unifiedControlPlaneImage` to be used instead of single image
for control plane components for control plane components
- provide an `etcd.image` name to be used - provide an `etcd.image` name to be used