fix(kube): fix kube path typo

fix kube path typo

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

Author: ysicing

README.md

@@ -19,6 +19,7 @@
 ### Linux 发行版
 
 * **Debian**  *11(推荐), 10*
+* **Rocky** *9, 8*
 * **Ubuntu**  *20.04, 18.04*
 * **CentOS**  *7*
 
@@ -82,15 +83,15 @@ q init -q edge
 
 ```bash
 # debian
-echo "deb [trusted=yes] https://apt.fury.io/qucheng/ /" | tee /etc/apt/sources.list.d/qcadmin.list
+echo "deb [trusted=yes] https://repo.qucheng.com/qucheng/ /" | tee /etc/apt/sources.list.d/qcadmin.list
 apt update
 apt search qcadmin
 apt install qcadmin
 # centos7
 cat > /etc/yum.repos.d/qcadmin.repo << EOF
 [fury]
 name=Qucheng Yum Repo
-baseurl=https://yum.fury.io/qucheng/
+baseurl=https://repo.qucheng.com/qucheng/
 enabled=1
 gpgcheck=0
 EOF
@@ -105,10 +106,15 @@ yum install qcadmin
 ```bash
 # create qucheng cluster
 q init
-# create a k3s cluster with other cidr
-q init --podsubnet 10.42.0.0/16 --svcsubnet 10.43.0.0/16
-# custom domain
-q init --domain qucheng.example.com
+```
+
+### 高级使用
+
+```bash
+# step 1. 创建k3s集群
+q cluster init
+# step 2. 初始化渠成平台
+q quickon init 
 ```
 
 ## 相关文档

cmd/app/get.go

@@ -9,6 +9,8 @@ package app
 import (
 	"os"
 
+	"github.com/easysoft/qcadmin/common"
+
 	"github.com/easysoft/qcadmin/internal/app/debug"
 	qcexec "github.com/easysoft/qcadmin/internal/pkg/util/exec"
 	"github.com/easysoft/qcadmin/internal/pkg/util/factory"
@@ -32,7 +34,7 @@ func NewCmdAppGet(f factory.Factory) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			extargs := []string{"exp", "kubectl", "get", "-o", "wide", "pods,deploy,pvc,svc,ing", "-l", "release=" + appdata.K8Name}
+			extargs := []string{"exp", "kubectl", "get", "-o", "wide", "pods,deploy,pvc,svc,ing", "-l", "release=" + appdata.K8Name, "--kubeconfig", common.GetDefaultNewKubeConfig()}
 			// extargs = append(extargs, args...)
 			return qcexec.CommandRun(os.Args[0], extargs...)
 		},

cmd/init.go

@@ -25,11 +25,13 @@ var (
 		Use:   "init",
 		Short: "Run this command in order to set up the QuCheng control plane",
 	}
-	skip bool
+	skip    bool
+	appName string
 )
 
 func init() {
 	initCmd.PersistentFlags().BoolVar(&skip, "skip-precheck", false, "skip precheck")
+	initCmd.PersistentFlags().StringVar(&appName, "app", "zentao", "app name")
 }
 
 func newCmdInit(f factory.Factory) *cobra.Command {
@@ -58,13 +60,17 @@ func newCmdInit(f factory.Factory) *cobra.Command {
 		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)
+				log.Errorf("init k8s cluster failed, reason: %v", err)
 				return
 			}
 		}
 		if err := qcexec.CommandRun(globalToolPath, "quickon", "init", fmt.Sprintf("--debug=%v", globalFlags.Debug)); err != nil {
-				log.Warnf("init quickon failed, reason: %v", err)
-				return
+			log.Errorf("init quickon failed, reason: %v", err)
+			return
+		}
+		if err := qcexec.CommandRun(globalToolPath, "app", "install", "--name", appName, "--api-useip", fmt.Sprintf("--debug=%v", globalFlags.Debug)); err != nil {
+			log.Errorf("init quickon failed, reason: %v", err)
+			return
 		}
 	}
 	return initCmd

internal/pkg/cli/tool/domain.go

@@ -134,12 +134,12 @@ func domainAdd(f factory.Factory) *cobra.Command {
 			if err := helmClient.UpdateRepo(); err != nil {
 				log.Warnf("update repo failed, reason: %v", err)
 			}
-			if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/hack/haogstls/haogs.yaml", common.GetDefaultDataDir()), "-n", common.GetDefaultSystemNamespace(true)).Run(); err != nil {
+			if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/hack/haogstls/haogs.yaml", common.GetDefaultDataDir()), "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 				log.Warnf("load tls cert for %s failed, reason: %v", common.GetDefaultSystemNamespace(true), err)
 			} else {
 				log.Donef("load tls cert for %s success", common.GetDefaultSystemNamespace(true))
 			}
-			if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/hack/haogstls/haogs.yaml", common.GetDefaultDataDir()), "-n", "default").Run(); err != nil {
+			if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/hack/haogstls/haogs.yaml", common.GetDefaultDataDir()), "-n", "default", "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 				log.Warnf("load tls cert for default failed, reason: %v", err)
 			} else {
 				log.Done("load tls cert for default success")

internal/pkg/cluster/qucheng.go

@@ -117,12 +117,12 @@ func (p *Cluster) InstallQuCheng() error {
 			if _, err := os.Stat(defaultTLS); err == nil {
 				p.Log.StopWait()
 				p.Log.Done("download tls cert success")
-				if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true)).Run(); err != nil {
+				if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 					p.Log.Warnf("load default tls cert failed, reason: %v", err)
 				} else {
 					p.Log.Done("load default tls cert success")
 				}
-				qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default").Run()
+				qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default", "--kubeconfig", common.GetDefaultNewKubeConfig()).Run()
 				break
 			}
 			_, mainDomain := kutil.SplitDomain(p.Domain)

internal/pkg/plugin/plugin.go

@@ -117,7 +117,7 @@ func (p *Item) UnInstall() error {
 		}
 	} else {
 		// #nosec
-		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "delete", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true))
+		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "delete", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig())
 		if output, err := applycmd.CombinedOutput(); err != nil {
 			p.log.Errorf("kubectl uninstall %s plugin %s failed: %s", p.Type, p.Name, string(output))
 			return err
@@ -160,7 +160,7 @@ func (p *Item) Install() error {
 		}
 	} else {
 		// #nosec
-		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true))
+		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig())
 		if output, err := applycmd.CombinedOutput(); err != nil {
 			p.log.Errorf("kubectl install %s plugin %s failed: %s", p.Type, p.Name, string(output))
 			return err
@@ -209,7 +209,7 @@ func (p *Item) Upgrade() (err error) {
 		}
 	} else {
 		// #nosec
-		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true))
+		applycmd := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", fmt.Sprintf("%s/%s", common.GetDefaultDataDir(), p.Path), "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig())
 		if output, err := applycmd.CombinedOutput(); err != nil {
 			p.log.Errorf("kubectl upgrade %s plugin %s failed: %s", p.Type, p.Name, string(output))
 			return err

internal/pkg/util/httptls/httptls.go

@@ -81,11 +81,11 @@ func renewCertificate(domain string) error {
 	coreDomain := fmt.Sprintf("%s.%s.%s", ds[len(ds)-3], ds[len(ds)-2], ds[len(ds)-1])
 	tlsfile := fmt.Sprintf("https://pkg.qucheng.com/ssl/%s/%s/tls.yaml", mainDomain, coreDomain)
 	log.Debugf("renew default tls certificate use %s", tlsfile)
-	if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", tlsfile, "-n", common.GetDefaultSystemNamespace(true)).Run(); err != nil {
+	if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", tlsfile, "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 		log.Warnf("load renew tls cert for %s failed, reason: %v", common.GetDefaultSystemNamespace(true), err)
 	}
 	log.Debugf("renew ingress tls certificate")
-	if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", tlsfile).Run(); err != nil {
+	if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", tlsfile, "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 		log.Warnf("load renew tls cert for default failed, reason: %v", err)
 	}
 	return nil

pkg/qucheng/upgrade/upgrade.go

@@ -121,12 +121,12 @@ func Upgrade(flagVersion string, log log.Logger) error {
 							if _, err := os.Stat(defaultTLS); err == nil {
 								log.StopWait()
 								log.Done("download tls cert success")
-								if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true)).Run(); err != nil {
+								if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 									log.Warnf("load default tls cert failed, reason: %v", err)
 								} else {
 									log.Done("load default tls cert success")
 								}
-								qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default").Run()
+								qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default", "--kubeconfig", common.GetDefaultNewKubeConfig()).Run()
 								args := []string{"ingress.tls.enabled=true", "ingress.tls.secretName=tls-haogs-cn"}
 								values, _ := helm.MergeValues(args)
 								defaultValue = helm.MergeMaps(defaultValue, values)

pkg/quickon/quickon.go

@@ -190,15 +190,15 @@ func (m *Meta) Init() error {
 		m.log.StartWait(fmt.Sprintf("start issuing domain %s certificate, may take 3-5min", m.Domain))
 		waittls := time.Now()
 		for {
-			if _, err := os.Stat(defaultTLS); err == nil {
+			if file.CheckFileExists(defaultTLS) {
 				m.log.StopWait()
 				m.log.Done("download tls cert success")
-				if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true)).Run(); err != nil {
+				if err := qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", common.GetDefaultSystemNamespace(true), "--kubeconfig", common.GetDefaultNewKubeConfig()).Run(); err != nil {
 					m.log.Warnf("load default tls cert failed, reason: %v", err)
 				} else {
 					m.log.Done("load default tls cert success")
 				}
-				qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default").Run()
+				qcexec.Command(os.Args[0], "experimental", "kubectl", "apply", "-f", defaultTLS, "-n", "default", "--kubeconfig", common.GetDefaultNewKubeConfig()).Run()
 				break
 			}
 			_, mainDomain := kutil.SplitDomain(m.Domain)