Merge branch 'main' into bcrm

Author: ZhangSetSail

api/handler/nodes.go

@@ -6,6 +6,7 @@ import (
 	"github.com/goodrain/rainbond/api/client/prometheus"
 	k8sutil "github.com/goodrain/rainbond/util/k8s"
 	"github.com/pquerna/ffjson/ffjson"
+	"github.com/shirou/gopsutil/disk"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
@@ -17,6 +18,7 @@ import (
 	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"runtime"
 	"strings"
 
 	"github.com/goodrain/rainbond/api/model"
@@ -205,6 +207,24 @@ func (n *nodesHandle) GetNodeInfo(ctx context.Context, nodeName string) (res mod
 	res.Resource.ReqDisk = diskCap - diskAvail
 	res.Resource.CapContainerDisk = containerDiskCap
 	res.Resource.ReqContainerDisk = containerDiskCap - containerDiskAvail
+
+	if res.Resource.CapDisk == 0 {
+		var diskStatus *disk.UsageStat
+		if runtime.GOOS != "windows" {
+			diskStatus, _ = disk.Usage("/")
+		} else {
+			diskStatus, _ = disk.Usage(`z:\\`)
+		}
+		var diskCap, reqDisk uint64
+		if diskStatus != nil {
+			diskCap = diskStatus.Total
+			reqDisk = diskStatus.Used
+		}
+		res.Resource.CapDisk = diskCap
+		res.Resource.ReqDisk = reqDisk
+		res.Resource.CapContainerDisk = diskCap
+		res.Resource.ReqContainerDisk = reqDisk
+	}
 	return res, nil
 }
 

builder/parser/docker_run.go

@@ -101,7 +101,7 @@ func (d *DockerRunOrImageParse) Parse() ParseErrorList {
 		tarPath := path.Join("/grdata/package_build/temp/events", eventID)
 		files, _ := filepath.Glob(path.Join(tarPath, "*"))
 		if len(files) == 1 {
-			if !strings.HasSuffix(files[0], ".tar") {
+			if !strings.HasSuffix(files[0], ".tar") && !strings.HasSuffix(files[0], ".tar.gz") {
 				d.errappend(ErrorAndSolve(FatalError, fmt.Sprintf("文件格式不正确"), SolveAdvice("modify_image", "请确认上传的文件格式是否正确")))
 				return d.errors
 			}
@@ -158,11 +158,13 @@ func (d *DockerRunOrImageParse) Parse() ParseErrorList {
 		d.image = ParseImageName(d.source)
 	}
 	//获取镜像，验证是否存在
-	if d.user == "" {
-		d.user = builder.REGISTRYUSER
-	}
-	if d.pass == "" {
-		d.pass = builder.REGISTRYPASS
+	if strings.HasPrefix(d.image.Source(), builder.REGISTRYDOMAIN) {
+		if d.user == "" {
+			d.user = builder.REGISTRYUSER
+		}
+		if d.pass == "" {
+			d.pass = builder.REGISTRYPASS
+		}
 	}
 	imageInspect, err := d.imageClient.ImagePull(d.image.Source(), d.user, d.pass, d.logger, 10)
 	if err != nil {

hack/contrib/docker/monitor/Dockerfile

@@ -8,9 +8,9 @@ ENV RELEASE_DESC=${RELEASE_DESC}
 COPY rainbond-monitor /run/rainbond-monitor
 
 RUN if [ $(arch) = "arm64" ] || [ $(arch) = "aarch64" ]; then \
-        wget https://pkg.goodrain.com/pkg/tini/v0.19.0/tini-arm -O /bin/tini && chmod +x /bin/tini; \
+        wget --no-check-certificate https://pkg.goodrain.com/pkg/tini/v0.19.0/tini-static-arm64 -O /bin/tini && chmod +x /bin/tini; \
     else \
-        wget https://pkg.goodrain.com/pkg/tini/v0.19.0/tini -O /bin/tini && chmod +x /bin/tini; \
+        wget --no-check-certificate https://pkg.goodrain.com/pkg/tini/v0.19.0/tini-static-amd64 -O /bin/tini && chmod +x /bin/tini; \
     fi
 
 ADD entrypoint.sh /run/entrypoint.sh

pkg/component/hubregistry/registryComponent.go

@@ -25,9 +25,11 @@ import (
 	"github.com/goodrain/rainbond/config/configs"
 	"github.com/goodrain/rainbond/grctl/clients"
 	"github.com/goodrain/rainbond/pkg/component/k8s"
+	"github.com/goodrain/rainbond/pkg/gogo"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/types"
+	"time"
 )
 
 var defaultRegistryComponent *RegistryComponent
@@ -61,10 +63,19 @@ func (r *RegistryComponent) Start(ctx context.Context, cfg *configs.Config) erro
 	if registryConfig.Domain == "goodrain.me" {
 		registryConfig.Domain = cfg.APIConfig.RbdHub
 	}
-
-	r.RegistryCli, err = registry.NewInsecure(registryConfig.Domain, registryConfig.Username, registryConfig.Password)
-	logrus.Info("init hub registry success")
-	return err
+	gogo.Go(func(ctx context.Context) error {
+		var err error
+		for {
+			r.RegistryCli, err = registry.NewInsecure(registryConfig.Domain, registryConfig.Username, registryConfig.Password)
+			if err == nil {
+				logrus.Infof("create hub client success")
+				return nil
+			}
+			logrus.Errorf("create hub client failed, try time is %d,%s", 10, err.Error())
+			time.Sleep(10 * time.Second)
+		}
+	})
+	return nil
 }
 
 // CloseHandle -