Merge pull request #30 from itdove/divers

better error message, small defect and wrong description for delete token

Author: openshift-merge-robot

pkg/cmd/delete/token/cmd.go

@@ -12,8 +12,8 @@ import (
 )
 
 var example = `
-# Get the bootstrap token
-%[1]s get token
+# Delete the bootstrap token
+%[1]s delete token
 `
 
 // NewCmd ...
@@ -22,7 +22,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 
 	cmd := &cobra.Command{
 		Use:          "token",
-		Short:        "get the bootsrap token",
+		Short:        "delete the bootsrap token",
 		Example:      fmt.Sprintf(example, helpers.GetExampleHeader()),
 		SilenceUsage: true,
 		PreRun: func(c *cobra.Command, args []string) {

pkg/cmd/get/token/exec.go

@@ -142,7 +142,7 @@ func waitForBootstrapToken(kubeClient kubernetes.Interface) (bool, error) {
 	_, err := helpers.GetBootstrapTokenFromSA(kubeClient)
 	switch {
 	case errors.IsNotFound(err):
-		return false, err
+		return false, nil
 	case err != nil:
 		return false, err
 	}