From ff5801ad0ccbc11deadeb37fa20922ebab878f5f Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Mon, 13 Feb 2017 09:59:33 -0800 Subject: [PATCH] kubeadm: fix to avoid panic if token not provided Prior to this, kubeadm would panic if no token was provided. This does a check and prints out a more reasonable message. --- cmd/kubeadm/app/cmd/token.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index 996d674a0d6..aed6e487855 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -92,6 +92,9 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command { Use: "delete", Short: "Delete bootstrap tokens on the server.", Run: func(tokenCmd *cobra.Command, args []string) { + if len(args) < 1 { + kubeadmutil.CheckErr(fmt.Errorf("missing subcommand; 'token delete' is missing token of form [\"^([a-z0-9]{6})$\"]")) + } err := RunDeleteToken(out, tokenCmd, args[0]) kubeadmutil.CheckErr(err) },