github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70071 from xichengliudui/fix18102203

Browse Source 
Fix grammatical errors and repeat words
This commit is contained in:
k8s-ci-robot 2018-10-25 07:12:20 -07:00 committed by GitHub
commit 584a86736e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/workflow/runner.go
View File

@ -84,7 +84,7 @@ type phaseRunner struct {
selfPath []string selfPath []string
// generatedName is the full name of the phase, that corresponds to the absolute // generatedName is the full name of the phase, that corresponds to the absolute
// path of the phase in the the workflow managed by the Runner. // path of the phase in the workflow managed by the Runner.
generatedName string generatedName string
// use is the phase usage string that will be printed in the workflow help. // use is the phase usage string that will be printed in the workflow help.

2
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@ -43,7 +43,7 @@ type kubeletFlagsOpts struct {
defaultHostname string defaultHostname string
} }
// WriteKubeletDynamicEnvFile writes a environment file with dynamic flags to the kubelet. // WriteKubeletDynamicEnvFile writes an environment file with dynamic flags to the kubelet.
// Used at "kubeadm init" and "kubeadm join" time. // Used at "kubeadm init" and "kubeadm join" time.
func WriteKubeletDynamicEnvFile(nodeRegOpts *kubeadmapi.NodeRegistrationOptions, featureGates map[string]bool, registerTaintsUsingFlags bool, kubeletDir string) error { func WriteKubeletDynamicEnvFile(nodeRegOpts *kubeadmapi.NodeRegistrationOptions, featureGates map[string]bool, registerTaintsUsingFlags bool, kubeletDir string) error {
hostName, err := nodeutil.GetHostname("") hostName, err := nodeutil.GetHostname("")

2
cmd/kubeadm/app/preflight/checks.go
View File

@ -1027,7 +1027,7 @@ func RunRootCheckOnly(ignorePreflightErrors sets.String) error {
return RunChecks(checks, os.Stderr, ignorePreflightErrors) return RunChecks(checks, os.Stderr, ignorePreflightErrors)
} }
// RunPullImagesCheck will pull images kubeadm needs if the are not found on the system // RunPullImagesCheck will pull images kubeadm needs if they are not found on the system
func RunPullImagesCheck(execer utilsexec.Interface, cfg *kubeadmapi.InitConfiguration, ignorePreflightErrors sets.String) error { func RunPullImagesCheck(execer utilsexec.Interface, cfg *kubeadmapi.InitConfiguration, ignorePreflightErrors sets.String) error {
containerRuntime, err := utilruntime.NewContainerRuntime(utilsexec.New(), cfg.GetCRISocket()) containerRuntime, err := utilruntime.NewContainerRuntime(utilsexec.New(), cfg.GetCRISocket())
if err != nil { if err != nil {