fix(install): fix quickon install

ysicing · ysicing · commit 52409c9ad99a · 2023-09-04T15:43:38.000+08:00
fix quickon install

Signed-off-by: ysicing &lt;i@ysicing.me&gt;
diff --git a/cmd/app/install.go b/cmd/app/install.go
@@ -121,7 +121,7 @@ func NewCmdAppInstall(f factory.Factory) *cobra.Command {
 				log.Debugf("authUsername: %s, authPassword: %s", authUsername, authPassword)
 				log.Infof("app meta:\n\t   username: %s\n\t   password: %s\n\t   url: %s", color.SBlue(authUsername), color.SBlue(authPassword), color.SBlue(host))
 			} else {
-				log.Infof("app meta:\n\t   url: %s", color.SBlue(host))
+				log.Infof("app meta:\n\turl: %s", color.SBlue(host))
 			}
 			return nil
 		},
diff --git a/cmd/init.go b/cmd/init.go
@@ -40,7 +40,7 @@ var (
 )
 
 func init() {
-	initCmd.Flags().StringVar(&cProvider, "provider", cProvider, "install provider, support devops, quickon")
+	initCmd.Flags().StringVarP(&cProvider, "provider", "p", cProvider, "install provider, support devops, quickon")
 	initCmd.PersistentFlags().BoolVar(&skip, "skip-precheck", false, "skip precheck")
 }
 
diff --git a/common/const.go b/common/const.go
@@ -62,8 +62,8 @@ const (
 )
 
 const (
-	DefaultQuickonOSSVersion      = "stable-2.6" // 开源版本
-	DefaultQuickonEEVersion       = "stable-1.0"
+	DefaultQuickonOSSVersion      = "3.0.2" // 开源版本
+	DefaultQuickonEEVersion       = "1.0"
 	DefaultZentaoDevOPSOSSVersion = "18.7"
 	DefaultZentaoDevOPSMaxVersion = "4.7"
 	DefaultZentaoDevOPSBizVersion = "8.7"
diff --git a/common/func.go b/common/func.go
@@ -82,7 +82,7 @@ func GetChannel(p string) string {
 }
 
 // GetVersion 获取版本地址
-func GetVersion(p, version string) string {
+func GetVersion(devops bool, p, version string) string {
 	v := strings.Split(version, "-")
 	if len(v) != 2 {
 		switch p {
@@ -93,7 +93,10 @@ func GetVersion(p, version string) string {
 		case string(ZenTaoMaxType):
 			return DefaultZentaoDevOPSMaxVersion
 		default:
-			return DefaultZentaoDevOPSOSSVersion
+			if devops {
+				return DefaultZentaoDevOPSOSSVersion
+			}
+			return DefaultQuickonOSSVersion
 		}
 	}
 	return v[1]
diff --git a/go.mod b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/sftp v1.13.5
 	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/shirou/gopsutil/v3 v3.23.7
+	github.com/shirou/gopsutil/v3 v3.23.8
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
@@ -42,7 +42,7 @@ require (
 	github.com/xlab/treeprint v1.2.0
 	golang.org/x/crypto v0.12.0
 	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.11.0
+	golang.org/x/sys v0.12.0
 	golang.org/x/term v0.11.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gotest.tools v2.2.0+incompatible
diff --git a/go.sum b/go.sum
@@ -134,8 +134,6 @@ github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUK
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU=
-github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE=
 github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=
 github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
@@ -231,8 +229,6 @@ github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQ
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ=
-github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE=
 github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -712,6 +708,8 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4=
 github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4=
+github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE=
+github.com/shirou/gopsutil/v3 v3.23.8/go.mod h1:7hmCaBn+2ZwaZOr6jmPBZDfawwMGuo1id3C6aM8EDqQ=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -1061,6 +1059,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/internal/pkg/util/preflight/checks.go b/internal/pkg/util/preflight/checks.go
@@ -686,7 +686,7 @@ func (ncc NumCPUCheck) Check() error {
 	}
 	if ncc.Devops {
 		if numCPU < ncc.NumCPU*2 {
-			log.Warnf("the number of available CPUs %d is greater than the required %d", numCPU, ncc.NumCPU*2)
+			log.Warnf("the number of available CPUs %d is greater than the minimum %d, less than the recommended %d", numCPU, ncc.NumCPU, ncc.NumCPU*2)
 			return nil
 		}
 		log.Donef("the number of available CPUs %d is greater than the required %d", numCPU, ncc.NumCPU*2)
diff --git a/internal/pkg/util/preflight/checks_linux.go b/internal/pkg/util/preflight/checks_linux.go
@@ -43,7 +43,7 @@ func (mc MemCheck) Check() error {
 	}
 	if mc.Devops {
 		if actual < mc.Mem*2 {
-			log.Warnf("the system RAM (%d MB) is less than the minimum %d MB", actual, mc.Mem*2)
+			log.Warnf("the system RAM (%d MB) is greater than the minimum %d MB, less than the recommended %d MB", actual, mc.Mem, mc.Mem*2)
 			return nil
 		}
 		log.Donef("the system RAM (%d MB) is greater than the minimum %d MB", actual, mc.Mem*2)
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -133,11 +133,10 @@ func (c *Cluster) GetSSHFlags() []types.Flag {
 			Usage:     "ssh user",
 		},
 		{
-			Name:      "password",
-			ShortHand: "p",
-			P:         &c.SSH.Passwd,
-			V:         c.SSH.Passwd,
-			Usage:     "ssh password",
+			Name:  "password",
+			P:     &c.SSH.Passwd,
+			V:     c.SSH.Passwd,
+			Usage: "ssh password",
 		},
 		{
 			Name:  "pkfile",
diff --git a/pkg/providers/devops/devops.go b/pkg/providers/devops/devops.go
@@ -58,6 +58,12 @@ func (q *Devops) GetFlags() []types.Flag {
 		Usage: fmt.Sprintf("zentao devops version %s", common.DefaultZentaoDevOPSOSSVersion),
 		P:     &q.MetaData.Version,
 		V:     q.MetaData.Version,
+	}, types.Flag{
+		Name:      "type",
+		Usage:     "devops type, support oss, max, biz, ipd",
+		P:         &q.MetaData.Type,
+		V:         common.ZenTaoOSSType.String(),
+		ShortHand: "t",
 	})
 	return fs
 }
diff --git a/pkg/providers/quickon/quickon.go b/pkg/providers/quickon/quickon.go
@@ -73,6 +73,12 @@ func (q *Quickon) GetFlags() []types.Flag {
 		Usage: "default quickon install app",
 		P:     &q.MetaData.App,
 		V:     q.MetaData.App,
+	}, types.Flag{
+		Name:      "type",
+		Usage:     "quickon type",
+		P:         &q.MetaData.Type,
+		V:         common.ZenTaoOSSType.String(),
+		ShortHand: "t",
 	})
 	return fs
 }
diff --git a/pkg/quickon/quickon.go b/pkg/quickon/quickon.go
@@ -73,13 +73,6 @@ func (m *Meta) GetCustomFlags() []types.Flag {
 			V:      m.IP,
 			Hidden: true,
 		},
-		{
-			Name:      "type",
-			Usage:     "type",
-			P:         &m.Type,
-			V:         common.ZenTaoOSSType.String(),
-			ShortHand: "t",
-		},
 		{
 			Name:   "offline",
 			Usage:  "offline install mode, default: false",
@@ -178,7 +171,7 @@ func (m *Meta) addHelmRepo() error {
 		}
 		m.Log.Debugf("quickon helm repo already exists")
 	} else {
-		m.Log.Done("add quickon helm repo success")
+		m.Log.Donef("add %s channel quickon helm repo success", common.GetChannel(m.Version))
 	}
 	output, err = qcexec.Command(os.Args[0], "experimental", "helm", "repo-update").CombinedOutput()
 	if err != nil {
@@ -216,8 +209,8 @@ func (m *Meta) Init() error {
 			return err
 		}
 	}
-	m.Log.Debugf("version: %v, type: %v", m.Version, m.Type)
-
+	installVersion := common.GetVersion(m.DevopsMode, m.Type, m.Version)
+	m.Log.Infof("devops: %v, type: %s, version: %s(%s), channel: %s", m.DevopsMode, m.Type, m.Version, installVersion, common.GetChannel(m.Version))
 	if m.DevopsMode {
 		// TODO: 获取zentao devops chart version
 		m.Log.Debugf("start init zentao devops")
@@ -336,7 +329,7 @@ func (m *Meta) Init() error {
 	}
 
 	helmargs = append(helmargs, "--set", fmt.Sprintf("ingress.host=%s", hostdomain))
-	installVersion := common.GetVersion(m.Type, m.Version)
+
 	if m.DevopsMode {
 		// 指定类型
 		helmargs = append(helmargs, "--set", fmt.Sprintf("deploy.product=%s", m.Type))

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func NewCmdAppInstall(f factory.Factory) *cobra.Command {`
`121`	`121`	`log.Debugf("authUsername: %s, authPassword: %s", authUsername, authPassword)`
`122`	`122`	`log.Infof("app meta:\n\t username: %s\n\t password: %s\n\t url: %s", color.SBlue(authUsername), color.SBlue(authPassword), color.SBlue(host))`
`123`	`123`	`} else {`
`124`		`- log.Infof("app meta:\n\t url: %s", color.SBlue(host))`
	`124`	`+ log.Infof("app meta:\n\turl: %s", color.SBlue(host))`
`125`	`125`	`}`
`126`	`126`	`return nil`
`127`	`127`	`},`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ var (`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`func init() {`
`43`		`- initCmd.Flags().StringVar(&cProvider, "provider", cProvider, "install provider, support devops, quickon")`
	`43`	`+ initCmd.Flags().StringVarP(&cProvider, "provider", "p", cProvider, "install provider, support devops, quickon")`
`44`	`44`	`initCmd.PersistentFlags().BoolVar(&skip, "skip-precheck", false, "skip precheck")`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func GetChannel(p string) string {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// GetVersion 获取版本地址`
`85`		`-func GetVersion(p, version string) string {`
	`85`	`+func GetVersion(devops bool, p, version string) string {`
`86`	`86`	`v := strings.Split(version, "-")`
`87`	`87`	`if len(v) != 2 {`
`88`	`88`	`switch p {`
`@@ -93,7 +93,10 @@ func GetVersion(p, version string) string {`
`93`	`93`	`case string(ZenTaoMaxType):`
`94`	`94`	`return DefaultZentaoDevOPSMaxVersion`
`95`	`95`	`default:`
`96`		`- return DefaultZentaoDevOPSOSSVersion`
	`96`	`+ if devops {`
	`97`	`+ return DefaultZentaoDevOPSOSSVersion`
	`98`	`+ }`
	`99`	`+ return DefaultQuickonOSSVersion`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`	`return v[1]`
Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ func (ncc NumCPUCheck) Check() error {`
`686`	`686`	`}`
`687`	`687`	`if ncc.Devops {`
`688`	`688`	`if numCPU < ncc.NumCPU*2 {`
`689`		`- log.Warnf("the number of available CPUs %d is greater than the required %d", numCPU, ncc.NumCPU*2)`
	`689`	`+ log.Warnf("the number of available CPUs %d is greater than the minimum %d, less than the recommended %d", numCPU, ncc.NumCPU, ncc.NumCPU*2)`
`690`	`690`	`return nil`
`691`	`691`	`}`
`692`	`692`	`log.Donef("the number of available CPUs %d is greater than the required %d", numCPU, ncc.NumCPU*2)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (mc MemCheck) Check() error {`
`43`	`43`	`}`
`44`	`44`	`if mc.Devops {`
`45`	`45`	`if actual < mc.Mem*2 {`
`46`		`- log.Warnf("the system RAM (%d MB) is less than the minimum %d MB", actual, mc.Mem*2)`
	`46`	`+ log.Warnf("the system RAM (%d MB) is greater than the minimum %d MB, less than the recommended %d MB", actual, mc.Mem, mc.Mem*2)`
`47`	`47`	`return nil`
`48`	`48`	`}`
`49`	`49`	`log.Donef("the system RAM (%d MB) is greater than the minimum %d MB", actual, mc.Mem*2)`