From 6ba9ae30ca1e681d6b99d48cddb4cec3750411fb Mon Sep 17 00:00:00 2001 From: hangaoshuai Date: Thu, 21 Jun 2018 09:56:36 +0800 Subject: [PATCH] fix some small mistakes in kubeadm --- cmd/kubeadm/app/cmd/upgrade/apply.go | 4 ++-- cmd/kubeadm/app/cmd/upgrade/diff.go | 2 +- cmd/kubeadm/app/cmd/upgrade/plan.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index e5922edb97a..d659f266b85 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -91,7 +91,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command { // If the version is specified in config file, pick up that value. if flags.cfgPath != "" { - glog.V(1).Infof("fetching configuration from file", flags.cfgPath) + glog.V(1).Infof("fetching configuration from file %s", flags.cfgPath) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmapiv1alpha2.MasterConfiguration{}) kubeadmutil.CheckErr(err) @@ -269,7 +269,7 @@ func PerformControlPlaneUpgrade(flags *applyFlags, client clientset.Interface, w fmt.Printf("[upgrade/apply] Upgrading your Self-Hosted control plane to version %q...\n", flags.newK8sVersionStr) // Upgrade the self-hosted cluster - glog.V(1).Infoln("[upgrade/apply] ugrading self-hosted cluster") + glog.V(1).Infoln("[upgrade/apply] upgrading self-hosted cluster") return upgrade.SelfHostedControlPlane(client, waiter, internalcfg, flags.newK8sVersion) } diff --git a/cmd/kubeadm/app/cmd/upgrade/diff.go b/cmd/kubeadm/app/cmd/upgrade/diff.go index 47180a54f09..0d9c99e9b93 100644 --- a/cmd/kubeadm/app/cmd/upgrade/diff.go +++ b/cmd/kubeadm/app/cmd/upgrade/diff.go @@ -78,7 +78,7 @@ func NewCmdDiff(out io.Writer) *cobra.Command { func runDiff(flags *diffFlags, args []string) error { // If the version is specified in config file, pick up that value. - glog.V(1).Infof("fetching configuration from file", flags.cfgPath) + glog.V(1).Infof("fetching configuration from file %s", flags.cfgPath) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmv1alpha2.MasterConfiguration{}) if err != nil { return err diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go index c0409229cdd..896e8ba479f 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan.go @@ -60,7 +60,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command { // If the version is specified in config file, pick up that value. if flags.cfgPath != "" { - glog.V(1).Infof("fetching configuration from file", flags.cfgPath) + glog.V(1).Infof("fetching configuration from file %s", flags.cfgPath) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmapiv1alpha2.MasterConfiguration{}) kubeadmutil.CheckErr(err)