feat(install): fix install typo

fix install typo

Signed-off-by: ysicing <[email protected]>

Author: ysicing

.drone.yml

@@ -20,8 +20,8 @@ steps:
     pull: always
     privileged: true
     commands:
-      - wget -O /drone/src/hack/bin/k3s-linux-amd64 https://pkg-1308438674.cos.ap-shanghai.myqcloud.com/qucheng/cli/stable/k3s/v1.24.10/k3s-linux-amd64
-      - wget -O /drone/src/hack/bin/k3s-linux-arm64 https://pkg-1308438674.cos.ap-shanghai.myqcloud.com/qucheng/cli/stable/k3s/v1.24.10/k3s-linux-arm64
+      - wget -O /drone/src/hack/bin/k3s-linux-amd64 https://pkg-1308438674.cos.ap-shanghai.myqcloud.com/qucheng/cli/stable/k3s/v1.24.11/k3s-linux-amd64
+      - wget -O /drone/src/hack/bin/k3s-linux-arm64 https://pkg-1308438674.cos.ap-shanghai.myqcloud.com/qucheng/cli/stable/k3s/v1.24.11/k3s-linux-arm64
       - chmod +x /drone/src/hack/bin/k3s-linux-amd64 /drone/src/hack/bin/k3s-linux-arm64
 
   - name: build

.golangci.yml

@@ -5,6 +5,7 @@ run:
     - hack/bin
     - testdata$
     - examples$
+    - internal/static
   skip-files:
   - "zz_*"
   - ".*test.go"

TODO.md

@@ -1,6 +1,5 @@
 # TODO
 
-
 ## 已知问题
 
 - [ ] 与`kubectl status`冲突

cmd/init.go

@@ -7,19 +7,16 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/easysoft/qcadmin/common"
-	"github.com/easysoft/qcadmin/internal/pkg/providers"
+	"github.com/easysoft/qcadmin/internal/pkg/k8s"
+	qcexec "github.com/easysoft/qcadmin/internal/pkg/util/exec"
 	"github.com/ergoapi/util/color"
 	"github.com/ergoapi/util/file"
 	"github.com/spf13/cobra"
 
-	// default provider
-	_ "github.com/easysoft/qcadmin/internal/pkg/providers/incluster"
-	_ "github.com/easysoft/qcadmin/internal/pkg/providers/native"
-
-	"github.com/easysoft/qcadmin/cmd/flags"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
 )
 
@@ -28,7 +25,6 @@ var (
 		Use:   "init",
 		Short: "Run this command in order to set up the QuCheng control plane",
 	}
-	cp   providers.Provider
 	skip bool
 )
 
@@ -37,46 +33,39 @@ func init() {
 }
 
 func newCmdInit(f factory.Factory) *cobra.Command {
-	// native.Init()
 	log := f.GetLog()
-
+	defaultArgs := os.Args
+	globalToolPath := defaultArgs[0]
 	name := "native"
-	if file.CheckFileExists(common.GetDefaultKubeConfig()) {
+	if file.CheckFileExists(common.GetKubeConfig()) {
 		name = "incluster"
 	}
 
-	if reg, err := providers.GetProvider(name); err != nil {
-		log.Fatalf("failed to get provider: %s", err)
-	} else {
-		cp = reg
-	}
-	initCmd.Flags().AddFlagSet(flags.ConvertFlags(initCmd, cp.GetCreateFlags()))
-	initCmd.Example = cp.GetUsageExample("create")
 	initCmd.PreRun = func(cmd *cobra.Command, args []string) {
-		defaultArgs := os.Args
 		if file.CheckFileExists(common.GetCustomConfig(common.InitFileName)) {
-			log.Donef("cluster is already initialized, just run %s get cluster status", color.SGreen("%s status", defaultArgs[0]))
+			log.Donef("quickon is already initialized, just run %s get cluster status", color.SGreen("%s status", globalToolPath))
 			os.Exit(0)
 		}
+		if name == "incluster" {
+			// TODO Check k8s ready
+			if _, err := k8s.NewSimpleClient(); err != nil {
+				log.Errorf("k8s is not ready, please check your k8s cluster, just run %s ", color.SGreen("%s exp kubectl get nodes", globalToolPath))
+				os.Exit(0)
+			}
+		}
 	}
 	initCmd.Run = func(cmd *cobra.Command, args []string) {
-		cp.SetLog(log)
-		if name != "incluster" {
-			if err := cp.PreSystemInit(); err != nil {
-				log.Fatalf("presystem init err, reason: %s", err)
+		if name == "native" {
+			log.Infof("start init native provider")
+			if err := qcexec.CommandRun(globalToolPath, "cluster", "init", fmt.Sprintf("--debug=%v", globalFlags.Debug)); err != nil {
+				log.Warnf("init k8s cluster failed, reason: %v", err)
+				return
 			}
 		}
-		if err := cp.CreateCheck(skip); err != nil {
-			log.Fatalf("precheck err, reason: %v", err)
-		}
-		if err := cp.CreateCluster(); err != nil {
-			log.Fatalf("init cluster err: %v", err)
-		}
-
-		if err := cp.InitQucheng(); err != nil {
-			log.Fatalf("init qucheng err: %v", err)
+		if err := qcexec.CommandRun(globalToolPath, "quickon", "init", fmt.Sprintf("--debug=%v", globalFlags.Debug)); err != nil {
+				log.Warnf("init quickon failed, reason: %v", err)
+				return
 		}
-		cp.Show()
 	}
 	return initCmd
 }

cmd/join.go

@@ -42,7 +42,7 @@ func NewResetPassword(f factory.Factory) *cobra.Command {
 	var useip bool
 	rp := &cobra.Command{
 		Use:     "reset-password",
-		Short:   "reset qucheng superadmin password",
+		Short:   "reset quickon admin password",
 		Aliases: []string{"rp", "re-pass"},
 		Run: func(cmd *cobra.Command, args []string) {
 			cfg, _ := config.LoadConfig()
@@ -80,7 +80,7 @@ func NewResetPassword(f factory.Factory) *cobra.Command {
 				log.Warn("not found password, will generate random password")
 				password = expass.PwGenAlphaNumSymbols(16)
 			}
-			log.Debugf("update superadmin password: %s", password)
+			log.Debugf("update admin password: %s", password)
 			client := req.C().SetLogger(nil).SetUserAgent(common.GetUG())
 			if log.GetLevel() > logrus.InfoLevel {
 				client = client.DevMode().EnableDumpAll()
@@ -106,10 +106,10 @@ func NewResetPassword(f factory.Factory) *cobra.Command {
 			}
 			cfg.ConsolePassword = password
 			cfg.SaveConfig()
-			log.Donef("update superadmin %s password %s success.", color.SGreen(result.Data.Account), color.SGreen(password))
+			log.Donef("gen admin %s password %s success.", color.SGreen(result.Data.Account), color.SGreen(password))
 		},
 	}
-	rp.Flags().StringVarP(&password, "password", "p", "", "superadmin password")
+	rp.Flags().StringVarP(&password, "password", "p", "", "admin password")
 	rp.Flags().BoolVar(&useip, "api-useip", true, "api use ip")
 	return rp
 }

cmd/manage/resetpassword.go

@@ -20,50 +20,56 @@ func CheckCommand(f factory.Factory) *cobra.Command {
 		Use:   "check",
 		Short: "check cluster ready",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			quickonCliet := quickon.New(f)
-			if err := quickonCliet.GetKubeClient(); err != nil {
+			quickonClient := quickon.New(f)
+			if err := quickonClient.GetKubeClient(); err != nil {
 				return err
 			}
-			return quickonCliet.Check()
+			return quickonClient.Check()
 		},
 	}
 	return check
 }
 
 func InitCommand(f factory.Factory) *cobra.Command {
-	quickonCliet := quickon.New(f)
+	quickonClient := quickon.New(f)
 	init := &cobra.Command{
 		Use:   "init",
 		Short: "init quickon",
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			if err := quickonClient.GetKubeClient(); err != nil {
+				return err
+			}
+			return quickonClient.Check()
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := quickonCliet.GetKubeClient(); err != nil {
+			if err := quickonClient.GetKubeClient(); err != nil {
 				return err
 			}
-			if len(quickonCliet.IP) == 0 {
+			if len(quickonClient.IP) == 0 {
 				cfg, _ := config.LoadConfig()
-				quickonCliet.IP = cfg.InitNode
+				quickonClient.IP = cfg.InitNode
 			}
-			return quickonCliet.Init()
+			return quickonClient.Init()
 		},
 	}
-	init.Flags().StringVar(&quickonCliet.Domain, "domain", "", "global domain")
-	init.Flags().StringVar(&quickonCliet.IP, "ip", "", "ip")
-	init.Flags().StringVar(&quickonCliet.ConsolePassword, "quickon-password", expass.PwGenAlphaNum(32), "quickon console password")
-	init.Flags().StringVar(&quickonCliet.Version, "version", common.DefaultQuchengVersion, "quick version")
+	init.Flags().StringVar(&quickonClient.Domain, "domain", "", "global domain")
+	init.Flags().StringVar(&quickonClient.IP, "ip", "", "ip")
+	init.Flags().StringVar(&quickonClient.ConsolePassword, "quickon-password", expass.PwGenAlphaNum(32), "quickon console password")
+	init.Flags().StringVar(&quickonClient.Version, "version", common.DefaultQuchengVersion, "quick version")
 	return init
 }
 
 func UninstallCommand(f factory.Factory) *cobra.Command {
-	quickonCliet := quickon.New(f)
+	quickonClient := quickon.New(f)
 	uninstall := &cobra.Command{
 		Use:     "uninstall",
 		Short:   "uninstall quickon",
 		Aliases: []string{"clean"},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := quickonCliet.GetKubeClient(); err != nil {
+			if err := quickonClient.GetKubeClient(); err != nil {
 				return err
 			}
-			return quickonCliet.UnInstall()
+			return quickonClient.UnInstall()
 		},
 	}
 	return uninstall

cmd/quickon/quickon.go

@@ -65,7 +65,6 @@ func BuildRoot(f factory.Factory) *cobra.Command {
 	rootCmd.AddCommand(newCmdVersion(f))
 	rootCmd.AddCommand(newCmdPreCheck(f))
 	rootCmd.AddCommand(newCmdInit(f))
-	rootCmd.AddCommand(newCmdJoin(f))
 	rootCmd.AddCommand(newCmdUninstall(f))
 	rootCmd.AddCommand(newCmdStatus(f))
 	rootCmd.AddCommand(newCmdUpgrade(f))

cmd/root.go

@@ -10,7 +10,7 @@ require (
 	github.com/cockroachdb/errors v1.9.1
 	github.com/containerd/continuity v0.3.0
 	github.com/docker/docker v20.10.22+incompatible
-	github.com/easysoft/quickon-api v0.6.0
+	github.com/easysoft/quickon-api v0.6.1
 	github.com/emirpasic/gods v1.18.1
 	github.com/ergoapi/util v0.3.12
 	github.com/gofrs/flock v0.8.1
@@ -37,20 +37,20 @@ require (
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	golang.org/x/crypto v0.6.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.5.0
-	golang.org/x/term v0.5.0
+	golang.org/x/sys v0.6.0
+	golang.org/x/term v0.6.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gotest.tools v2.2.0+incompatible
 	helm.sh/helm/v3 v3.11.1
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
 	k8s.io/cli-runtime v0.26.0
 	k8s.io/client-go v0.26.1
-	k8s.io/component-base v0.26.0
+	k8s.io/component-base v0.26.1
 	k8s.io/kubectl v0.26.0
 	k8s.io/metrics v0.25.6
 	k8s.io/system-validators v1.7.0
-	k8s.io/utils v0.0.0-20230115233650-391b47cb4029
+	k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -198,12 +198,12 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/time v0.2.0 // indirect
-	golang.org/x/tools v0.5.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
 	google.golang.org/grpc v1.51.0 // indirect
@@ -212,14 +212,14 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.26.0 // indirect
-	k8s.io/apiserver v0.26.0 // indirect
+	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/apiserver v0.26.1 // indirect
 	k8s.io/component-helpers v0.25.6 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
 	oras.land/oras-go v1.2.2 // indirect
-	sigs.k8s.io/controller-runtime v0.12.3 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/controller-runtime v0.14.5 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.12.1 // indirect
 	sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect