15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #327 from zgldh/master 

Change to user.Username
This commit is contained in:
KubeSphere CI Bot 2020-10-01 23:18:50 +08:00 committed by GitHub
parent ea2a755072 6d6bbcd7f0
commit 32d846c178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/bootstrap/os.go
View File

@ -35,8 +35,8 @@ var registryCrt string
func InitOS(mgr *manager.Manager) error {
user, _ := user.Current()
if user.Name != "root" {
return errors.New(fmt.Sprintf("Current user is %s. Please use root!", user.Name))
if user.Username != "root" {
return errors.New(fmt.Sprintf("Current user is %s. Please use root!", user.Username))
}
mgr.Logger.Infoln("Init operating system")

4
pkg/config/parse.go
View File

@ -38,8 +38,8 @@ func ParseClusterCfg(clusterCfgPath, k8sVersion, ksVersion string, ksEnabled boo
var clusterCfg *kubekeyapiv1alpha1.Cluster
if len(clusterCfgPath) == 0 {
user, _ := user.Current()
if user.Name != "root" {
return nil, errors.New(fmt.Sprintf("Current user is %s. Please use root!", user.Name))
if user.Username != "root" {
return nil, errors.New(fmt.Sprintf("Current user is %s. Please use root!", user.Username))
}
clusterCfg = AllinoneCfg(user, k8sVersion, ksVersion, ksEnabled, logger)
} else {