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

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.8

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Update photon-controller.md (#5279)
  add back Zach and Steve to PR assignment
  fix the command output
  Update troubleshooting.md
  Update guaranteed-scheduling-critical-addon-pods.md
  Include filename fix (#5139)
  k8s-tutorials-stateful-application (#5112)
  Update gce.md (#5163)
  Update stage-documentation-changes.md (#5213)
  fix the command output
  Fix token-authentication-file internal link
This commit is contained in:
Andrew Chen
2017-09-05 14:05:06 -07:00
parent 7b692cdb29 3164b8a979
commit fc7c06c1e5
25 changed files with 4022 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/kubelet-tls-bootstrapping.md
+1 -1
View File
@@ -26,7 +26,7 @@ controller. As this feature matures, you should ensure tokens are bound to a Rol
While any authentication strategy can be used for the kubelet's initial bootstrap credentials, the following two authenticators are recommended for ease of provisioning.
1. [Bootstrap Tokens](/docs/admin/bootstrap-tokens/) - __alpha__
2. [Token authentication file](###token-authentication-file)
2. [Token authentication file](#token-authentication-file)
Using bootstrap tokens is currently __alpha__ and will simplify the management of bootstrap token management especially in a HA scenario.