github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68079 from huangqg/fix_kubeadm_typo 

fix typos in some files
pull/58/head
k8s-ci-robot 2018-09-25 05:02:04 -07:00 committed by GitHub
parent 9c29560ac8 d21c6fb381
commit 893e87bf30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -489,7 +489,7 @@ func rollbackOldManifests(oldManifests map[string]string, origErr error, pathMgr
return fmt.Errorf("couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced: %v", errs) return fmt.Errorf("couldn't upgrade control plane. kubeadm has tried to recover everything into the earlier state. Errors faced: %v", errs)
} }
// rollbackEtcdData rolls back the the content of etcd folder if something went wrong. // rollbackEtcdData rolls back the content of etcd folder if something went wrong.
// When the folder contents are successfully rolled back, nil is returned, otherwise an error is returned. // When the folder contents are successfully rolled back, nil is returned, otherwise an error is returned.
func rollbackEtcdData(cfg *kubeadmapi.InitConfiguration, pathMgr StaticPodPathManager) error { func rollbackEtcdData(cfg *kubeadmapi.InitConfiguration, pathMgr StaticPodPathManager) error {
backupEtcdDir := pathMgr.BackupEtcdDir() backupEtcdDir := pathMgr.BackupEtcdDir()

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

@ -501,7 +501,7 @@ func (subnet HTTPProxyCIDRCheck) Check() (warnings, errors []error) {
return nil, nil return nil, nil
} }
// SystemVerificationCheck defines struct used for for running the system verification node check in test/e2e_node/system // SystemVerificationCheck defines struct used for running the system verification node check in test/e2e_node/system
type SystemVerificationCheck struct { type SystemVerificationCheck struct {
IsDocker bool IsDocker bool
} }