github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94727 from mlevesquedion/fix/avoid-logging-kubeadm-tokens-before-deleting-them

Browse Source 
kubeadm: Avoid logging token in RunDeleteTokens
This commit is contained in:
Kubernetes Prow Robot 2020-09-14 06:04:58 -07:00 committed by GitHub
commit 9962577929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/token.go
View File

@ -420,13 +420,13 @@ func RunDeleteTokens(out io.Writer, client clientset.Interface, tokenIDsOrTokens
for _, tokenIDOrToken := range tokenIDsOrTokens { for _, tokenIDOrToken := range tokenIDsOrTokens {
// Assume this is a token id and try to parse it // Assume this is a token id and try to parse it
tokenID := tokenIDOrToken tokenID := tokenIDOrToken
klog.V(1).Infof("[token] parsing token %q", tokenIDOrToken) klog.V(1).Info("[token] parsing token")
if !bootstraputil.IsValidBootstrapTokenID(tokenIDOrToken) { if !bootstraputil.IsValidBootstrapTokenID(tokenIDOrToken) {
// Okay, the full token with both id and secret was probably passed. Parse it and extract the ID only // Okay, the full token with both id and secret was probably passed. Parse it and extract the ID only
bts, err := kubeadmapiv1beta2.NewBootstrapTokenString(tokenIDOrToken) bts, err := kubeadmapiv1beta2.NewBootstrapTokenString(tokenIDOrToken)
if err != nil { if err != nil {
return errors.Errorf("given token %q didn't match pattern %q or %q", return errors.Errorf("given token didn't match pattern %q or %q",
tokenIDOrToken, bootstrapapi.BootstrapTokenIDPattern, bootstrapapi.BootstrapTokenIDPattern) bootstrapapi.BootstrapTokenIDPattern, bootstrapapi.BootstrapTokenIDPattern)
} }
tokenID = bts.ID tokenID = bts.ID
} }