feat(update): update inner tools

update inner tools

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

Author: ysicing

VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

common/vars.go

@@ -21,7 +21,7 @@ type cloudAPIS struct {
 }
 
 var (
-	ValidPrefixes     = []string{"qcadmin"}
+	ValidPrefixes     = []string{"qcadmin", "qc"}
 	ValidDomainSuffix = []string{"haogs.cn", "corp.cc"}
 )
 

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/easysoft/quikon-api v0.5.0
 	github.com/emirpasic/gods v1.18.1
-	github.com/ergoapi/util v0.2.24
+	github.com/ergoapi/util v0.2.25
 	github.com/gofrs/flock v0.8.1
 	github.com/gosuri/uitable v0.0.4
 	github.com/imroc/req/v3 v3.25.0

go.sum

@@ -245,8 +245,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ergoapi/util v0.2.24 h1:Tp16KGq4at6kn9r3xUPZ44JMyYbBSBMdyoyiYknQMkE=
-github.com/ergoapi/util v0.2.24/go.mod h1:lc2keKuxkzG0Uu3hTN8f/GECHTjjRse8mQ97RC6CaCc=
+github.com/ergoapi/util v0.2.25 h1:LF7KxGgqPKFep4tWM+MkrxShF0Dk9Xn34tjRhCy7h78=
+github.com/ergoapi/util v0.2.25/go.mod h1:lc2keKuxkzG0Uu3hTN8f/GECHTjjRse8mQ97RC6CaCc=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=

hack/manifests/scripts/qc-dps

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+command_exists() {
+	command -v "$@" > /dev/null 2>&1
+}
+
+# 安装了docker
+if command_exists docker && [ -e /var/run/docker.sock ]; then
+		(
+			docker ps -a
+		) || true
+elif command_exists crictl; then
+  (
+    defaultdir=$(cat .qc/config/cluster.yaml | grep datadir | awk '{print $2}')
+    cfgdir=${defaultdir:-/opt/quickon}
+    crictl --config ${cfgdir}/platform/agent/etc/crictl.yaml ps -a
+  ) || true
+fi

internal/static/stage.go

@@ -7,11 +7,15 @@
 package static
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/easysoft/qcadmin/common"
 	"github.com/easysoft/qcadmin/internal/static/data"
 	"github.com/easysoft/qcadmin/internal/static/deploy"
 	"github.com/easysoft/qcadmin/internal/static/haogstls"
 	"github.com/easysoft/qcadmin/internal/static/scripts"
+	"github.com/ergoapi/util/file"
 )
 
 func StageFiles() error {
@@ -28,5 +32,27 @@ func StageFiles() error {
 	if err := haogstls.Stage(dataDir); err != nil {
 		return err
 	}
+	if err := initInternalCommand(dataDir); err != nil {
+		return err
+	}
+	return nil
+}
+
+func initInternalCommand(dataDir string) error {
+	// cp -a /root/.qc/data/hack/manifests/scripts/qc-* /root/.qc/bin/
+	// cp -a /root/.qc/data/hack/manifests/scripts/qcadmin-* /root/.qc/bin/
+	sourcePath := fmt.Sprintf("%s/hack/manifests/scripts", dataDir)
+	files, err := file.DirFilesList(sourcePath, common.ValidPrefixes, nil)
+	if err != nil {
+		return err
+	}
+	for _, f := range files {
+		s := strings.Split(f, "/")
+		targetfile := fmt.Sprintf("%s/%s", common.GetDefaultBinDir(), s[len(s)-1])
+		sourcefile := fmt.Sprintf("%s/%s", sourcePath, f)
+		if err := file.Copy(sourcefile, targetfile, true); err != nil {
+			return err
+		}
+	}
 	return nil
 }