Commit 6ba9ae30 authored by hangaoshuai's avatar hangaoshuai

fix some small mistakes in kubeadm

parent 293a93b3
...@@ -91,7 +91,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command { ...@@ -91,7 +91,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
// If the version is specified in config file, pick up that value. // If the version is specified in config file, pick up that value.
if flags.cfgPath != "" { 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{}) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmapiv1alpha2.MasterConfiguration{})
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
...@@ -269,7 +269,7 @@ func PerformControlPlaneUpgrade(flags *applyFlags, client clientset.Interface, w ...@@ -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) fmt.Printf("[upgrade/apply] Upgrading your Self-Hosted control plane to version %q...\n", flags.newK8sVersionStr)
// Upgrade the self-hosted cluster // 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) return upgrade.SelfHostedControlPlane(client, waiter, internalcfg, flags.newK8sVersion)
} }
......
...@@ -78,7 +78,7 @@ func NewCmdDiff(out io.Writer) *cobra.Command { ...@@ -78,7 +78,7 @@ func NewCmdDiff(out io.Writer) *cobra.Command {
func runDiff(flags *diffFlags, args []string) error { func runDiff(flags *diffFlags, args []string) error {
// If the version is specified in config file, pick up that value. // 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{}) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmv1alpha2.MasterConfiguration{})
if err != nil { if err != nil {
return err return err
......
...@@ -60,7 +60,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command { ...@@ -60,7 +60,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
// If the version is specified in config file, pick up that value. // If the version is specified in config file, pick up that value.
if flags.cfgPath != "" { 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{}) cfg, err := configutil.ConfigFileAndDefaultsToInternalConfig(flags.cfgPath, &kubeadmapiv1alpha2.MasterConfiguration{})
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment