From 0a103f0739703d32a6c22f139109f9624341ce7b Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Fri, 15 Sep 2017 09:17:29 -0500 Subject: [PATCH 1/2] Update bootstrap tokens doc for 1.8. This has some changes I missed when I was updating the main kubeadm documention: - Bootstrap tokens are now beta, not alpha (https://github.com/kubernetes/features/issues/130) - The apiserver flag to enable the authenticator changedin 1.8 (https://github.com/kubernetes/kubernetes/pull/51198) - Added `auth-extra-groups` documentaion (https://github.com/kubernetes/kubernetes/pull/50933) - Updated the _Token Management with `kubeadm`_ section to link to the main kubeadm docs, since it was just duplicated information. --- docs/admin/bootstrap-tokens.md | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/docs/admin/bootstrap-tokens.md b/docs/admin/bootstrap-tokens.md index d1f13a5585bcb..819591e98f00c 100644 --- a/docs/admin/bootstrap-tokens.md +++ b/docs/admin/bootstrap-tokens.md @@ -24,7 +24,7 @@ Controller Manager. The tokens are also used to create a signature for a specific ConfigMap used in a "discovery" process through a BootstrapSigner controller. -Currently, Bootstrap Tokens are **alpha** but there are no large breaking +Currently, Bootstrap Tokens are **beta** and there are no large breaking changes expected. ## Token Format @@ -39,10 +39,10 @@ only be shared with trusted parties. ## Enabling Bootstrap Tokens -All features for Bootstrap Tokens are disabled by default in Kubernetes v1.6. +All features for Bootstrap Tokens are disabled by default in Kubernetes v1.8. You can enable the Bootstrap Token authenticator with the -`--experimental-bootstrap-token-auth` flag on the API server. You can enable +`--enable-bootstrap-token-auth` flag on the API server. You can enable the Bootstrap controllers by specifying them with the `--controllers` flag on the controller manager with something like `--controllers=*,tokencleaner,bootstrapsigner`. This is done automatically when @@ -78,6 +78,7 @@ data: expiration: base64(2017-03-10T03:22:11Z) usage-bootstrap-authentication: base64(true) usage-bootstrap-signing: base64(true) + auth-extra-groups: base64(system:bootstrappers:group1,system:bootstrappers:group2) ``` The type of the secret must be `bootstrap.kubernetes.io/token` and the name must @@ -92,8 +93,11 @@ for. A value must be set to `true` to be enabled. `usage-bootstrap-authentication` indicates that the token can be used to authenticate to the API server. The authenticator authenticates as `system:bootstrap:`. It is included in the `system:bootstrappers` -group. The naming and groups are intentionally limited to discourage users from -using these tokens past bootstrapping. +group. `auth-extra-groups` indicates that it will also be included in the +`system:bootstrappers:group1`, and `system:bootstrappers:group2` groups. The +naming and groups are intentionally limited to discourage users from using these +tokens past bootstrapping. Extra bootstrap token groups must start with +`system:bootstrappers:`. `usage-bootstrap-signing` indicates that the token should be used to sign the `cluster-info` ConfigMap as described below. @@ -104,24 +108,8 @@ controller will delete expired tokens. ## Token Management with `kubeadm` -You can use the `kubeadm` tool to manage tokens on a running cluster. It will -automatically grab the default admin credentials on a master from a `kubeadm` -created cluster (`/etc/kubernetes/admin.conf`). You can specify an alternate -kubeconfig file for credentials with the `--kubeconfig` to the following -commands. - -* `kubeadm token list` Lists the tokens along with when they expire and what the - approved usages are. -* `kubeadm token create` Creates a new token. - * `--description` Set the description on the new token. - * `--ttl duration` Set expiration time of the token as a delta from "now". - Default is 0 for no expiration. - * `--usages` Set the ways that the token can be used. The default is - `signing,authentication`. These are the usages as described above. -* `kubeadm token delete |.` Delete a token. - The token can either be identified with just an ID or with the entire token - value. Only the ID is used; the token is still deleted if the secret does not - match. +You can use the `kubeadm` tool to manage tokens on a running cluster. See [the +`kubeadm token` docs](/docs/admin/kubeadm/#manage-tokens) for details. ## ConfigMap Signing From 4c5a57484171e11c48f55891a420a0b03346f51f Mon Sep 17 00:00:00 2001 From: Steve Perry Date: Mon, 18 Sep 2017 17:46:07 -0700 Subject: [PATCH 2/2] Update bootstrap-tokens.md --- docs/admin/bootstrap-tokens.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/admin/bootstrap-tokens.md b/docs/admin/bootstrap-tokens.md index 819591e98f00c..44834b2b0c4db 100644 --- a/docs/admin/bootstrap-tokens.md +++ b/docs/admin/bootstrap-tokens.md @@ -24,8 +24,7 @@ Controller Manager. The tokens are also used to create a signature for a specific ConfigMap used in a "discovery" process through a BootstrapSigner controller. -Currently, Bootstrap Tokens are **beta** and there are no large breaking -changes expected. +{% include feature-state-beta.md %} ## Token Format @@ -108,8 +107,8 @@ controller will delete expired tokens. ## Token Management with `kubeadm` -You can use the `kubeadm` tool to manage tokens on a running cluster. See [the -`kubeadm token` docs](/docs/admin/kubeadm/#manage-tokens) for details. +You can use the `kubeadm` tool to manage tokens on a running cluster. See the +[`kubeadm token` docs](/docs/admin/kubeadm/#manage-tokens) for details. ## ConfigMap Signing