From d5098c162402f9e507b21b64e47fc4ff929ae6f3 Mon Sep 17 00:00:00 2001 From: Alexander Kanevskiy Date: Fri, 15 Sep 2017 16:03:58 +0300 Subject: [PATCH] Remove warning about changes in default token TTLs It was planned for 1.9 cleanup to remove that warning, as change was done few release cycles ago and users should be already aware of it. Closes: kubernetes/kubeadm#346 --- cmd/kubeadm/app/cmd/init.go | 6 ------ cmd/kubeadm/app/cmd/token.go | 6 ------ 2 files changed, 12 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 28e0d873683..4d7e9a0a47e 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -128,12 +128,6 @@ func NewCmdInit(out io.Writer) *cobra.Command { i, err := NewInit(cfgPath, internalcfg, skipPreFlight, skipTokenPrint, dryRun) kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(i.Validate(cmd)) - - // TODO: remove this warning in 1.9 - if !cmd.Flags().Lookup("token-ttl").Changed { - fmt.Println("[kubeadm] WARNING: starting in 1.8, tokens expire after 24 hours by default (if you require a non-expiring token use --token-ttl 0)") - } - kubeadmutil.CheckErr(i.Run(out)) }, } diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index ac6f30117e9..14bc37db507 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -110,12 +110,6 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command { client, err := getClientset(kubeConfigFile, dryRun) kubeadmutil.CheckErr(err) - // TODO: remove this warning in 1.9 - if !tokenCmd.Flags().Lookup("ttl").Changed { - // sending this output to stderr s - fmt.Fprintln(errW, "[kubeadm] WARNING: starting in 1.8, tokens expire after 24 hours by default (if you require a non-expiring token use --ttl 0)") - } - err = RunCreateToken(out, client, token, tokenDuration, usages, extraGroups, description) kubeadmutil.CheckErr(err) },