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

kubeadm: update the reference documentation for 1.15 (#14596)

Browse Source 
* kubeadm-ref: update placeholder generated files

* kubeadm-ref: include reset-phase.md document

Also update reset.md to reflect the addition of reset phases.

* kubeadm-ref: update authored content

* kubeadm-ref: remove imports for removed "config upload" commands

* kubeadm-ref: add page for kubeadm upgrade phases
This commit is contained in:
Lubomir I. Ivanov
2019-06-11 04:56:16 +03:00
committed by Kubernetes Prow Robot
parent 3d1d270e3c
commit 2a0f39fb41
125 changed files with 1611 additions and 5878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/reference/setup-tools/kubeadm/kubeadm-join.md
+5 -2
View File
@@ -98,9 +98,12 @@ kubeadm join --discovery-token abcdef.1234567890abcdef --discovery-token-ca-cert
For control-plane nodes:
```shell
kubeadm join --discovery-token abcdef.1234567890abcdef --discovery-token-ca-cert-hash sha256:1234..cdef --experimental-control-plane 1.2.3.4:6443
kubeadm join --discovery-token abcdef.1234567890abcdef --discovery-token-ca-cert-hash sha256:1234..cdef --control-plane 1.2.3.4:6443
```
You can also call `join` for a control-plane node with `--certificate-key` to copy certificates to this node,
if the `kubeadm init` command was called with `--upload-certs`.
**Advantages:**
- Allows bootstrapping nodes to securely discover a root of trust for the
@@ -250,7 +253,7 @@ contain a `JoinConfiguration` structure.
To print the default values of `JoinConfiguration` run the following command:
```shell
kubeadm config print-default --api-objects=JoinConfiguration
kubeadm config print join-defaults
```
For details on individual fields in `JoinConfiguration` see [the godoc](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#JoinConfiguration).