github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114016 from songxiao-wang87/runwxs-test3

Browse Source 
word misspelling
This commit is contained in:
Kubernetes Prow Robot 2023-02-28 14:53:16 -08:00 committed by GitHub
commit bd1435dccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/certs.go
View File

@ -274,7 +274,7 @@ func getRenewSubCommands(out io.Writer, kdir string) []*cobra.Command {
return err 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) rm, err := renewal.NewManager(&internalcfg.ClusterConfiguration, kdir)
if err != nil { if err != nil {
return err 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) return configutil.LoadOrDefaultInitConfiguration(cfgPath, cmdutil.DefaultInitConfiguration(), &cfg)
} }

2
cmd/kubeadm/app/cmd/init.go
View File

@ -113,7 +113,7 @@ func newCmdInit(out io.Writer, initOptions *initOptions) *cobra.Command {
Args: cobra.NoArgs, 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 // init command local flags could be eventually inherited by the sub-commands automatically generated for phases
AddInitConfigFlags(cmd.Flags(), initOptions.externalInitCfg) AddInitConfigFlags(cmd.Flags(), initOptions.externalInitCfg)
AddClusterConfigFlags(cmd.Flags(), initOptions.externalClusterCfg, &initOptions.featureGatesString) AddClusterConfigFlags(cmd.Flags(), initOptions.externalClusterCfg, &initOptions.featureGatesString)

4
cmd/kubeadm/app/cmd/upgrade/plan.go
View File

@ -286,9 +286,9 @@ func runPlan(flags *planFlags, args []string, printer output.Printer) error {
return err 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 // 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 plan.ConfigVersions = configVersionStates
printUpgradePlan(&up, plan, unstableVersionFlag, isExternalEtcd, os.Stdout, printer) printUpgradePlan(&up, plan, unstableVersionFlag, isExternalEtcd, os.Stdout, printer)