From c7996a7236ee67c01babcfca3f4a91f88cca699e Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Wed, 23 Aug 2017 16:37:56 -0500 Subject: [PATCH] kubeadm: add extra group info to `token list`. This adds an `EXTRA GROUPS` column to the output of `kubeadm token list`. This displays any extra `system:bootstrappers:*` groups that are specified in the token's `auth-extra-groups` key. --- cmd/kubeadm/app/cmd/token.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index 1aab3f196e0..f21b22934b2 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -265,7 +265,7 @@ func RunListTokens(out io.Writer, errW io.Writer, client clientset.Interface) er } w := tabwriter.NewWriter(out, 10, 4, 3, ' ', 0) - fmt.Fprintln(w, "TOKEN\tTTL\tEXPIRES\tUSAGES\tDESCRIPTION") + fmt.Fprintln(w, "TOKEN\tTTL\tEXPIRES\tUSAGES\tDESCRIPTION\tEXTRA GROUPS") for _, secret := range secrets.Items { tokenId := getSecretString(&secret, bootstrapapi.BootstrapTokenIDKey) if len(tokenId) == 0 { @@ -323,7 +323,12 @@ func RunListTokens(out io.Writer, errW io.Writer, client clientset.Interface) er if len(description) == 0 { description = "" } - fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", tokenutil.BearerToken(td), ttl, expires, usageString, description) + + groups := getSecretString(&secret, bootstrapapi.BootstrapTokenExtraGroupsKey) + if len(groups) == 0 { + groups = "" + } + fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\n", tokenutil.BearerToken(td), ttl, expires, usageString, description, groups) } w.Flush() return nil