merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - jbeda
 title: Authenticating with Bootstrap Tokens
 ---
@@ -93,8 +93,8 @@ stringData:
  expiration: 2017-03-10T03:22:11Z

  # Allowed usages.
-  usage-bootstrap-authentication: true
-  usage-bootstrap-signing: true
+  usage-bootstrap-authentication: "true"
+  usage-bootstrap-signing: "true"

  # Extra groups to authenticate the token as. Must start with "system:bootstrappers:"
  auth-extra-groups: system:bootstrappers:worker,system:bootstrappers:ingress