mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
Merge pull request #114016 from songxiao-wang87/runwxs-test3
word misspelling
This commit is contained in:
commit
bd1435dccd
@ -274,7 +274,7 @@ func getRenewSubCommands(out io.Writer, kdir string) []*cobra.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
// Get a renewal manager for a actual Cluster configuration
|
||||
// Get a renewal manager for an actual Cluster configuration
|
||||
rm, err := renewal.NewManager(&internalcfg.ClusterConfiguration, kdir)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -352,7 +352,7 @@ func getInternalCfg(cfgPath string, kubeconfigPath string, cfg kubeadmapiv1.Clus
|
||||
}
|
||||
}
|
||||
|
||||
// Otherwise read config from --config if provided, otherwise use default configuration
|
||||
// Read config from --config if provided. Otherwise, use the default configuration
|
||||
return configutil.LoadOrDefaultInitConfiguration(cfgPath, cmdutil.DefaultInitConfiguration(), &cfg)
|
||||
}
|
||||
|
||||
|
@ -113,7 +113,7 @@ func newCmdInit(out io.Writer, initOptions *initOptions) *cobra.Command {
|
||||
Args: cobra.NoArgs,
|
||||
}
|
||||
|
||||
// adds flags to the init command
|
||||
// add flags to the init command.
|
||||
// init command local flags could be eventually inherited by the sub-commands automatically generated for phases
|
||||
AddInitConfigFlags(cmd.Flags(), initOptions.externalInitCfg)
|
||||
AddClusterConfigFlags(cmd.Flags(), initOptions.externalClusterCfg, &initOptions.featureGatesString)
|
||||
|
@ -286,9 +286,9 @@ func runPlan(flags *planFlags, args []string, printer output.Printer) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// Actually, this is needed for machine readable output only.
|
||||
// Actually, this is needed for machine-readable output only.
|
||||
// printUpgradePlan won't output the configVersionStates as it will simply print the same table several times
|
||||
// in the human readable output if it did so
|
||||
// in the human-readable output if it did so
|
||||
plan.ConfigVersions = configVersionStates
|
||||
|
||||
printUpgradePlan(&up, plan, unstableVersionFlag, isExternalEtcd, os.Stdout, printer)
|
||||
|
Loading…
Reference in New Issue
Block a user