feat: 许多变化

1. make apps 逻辑大变更， vendor 成标准传入 args
  2. nginx -> app-helper

internal/controller/installer/installer.check.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/syscheck"
 )
 

internal/controller/installer/installer.go

@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 )
 
 type installer struct {

internal/controller/installer/installer.k0s.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"github.com/samber/lo"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 )
 
 type K0sOpt func(*k0sOpt)

internal/controller/installer/installer.prepare.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 )
 
 func (i *installer) Prepare(ctx context.Context) error {

internal/controller/maker/app.client.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/app.front.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )

internal/controller/maker/app.gateway.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/app.helper.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/app.mie.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/app.nginx.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/internal/opt"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/app.oem.go

@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/archiver"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )

internal/controller/maker/app.user.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/binary.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/archiver"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/client.pkg.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"github.com/samber/lo"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/command.go

@@ -5,6 +5,8 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
+
+	"yizhisec.com/hsv2/forge/pkg/logger"
 )
 
 func (m *maker) RunCommand(ctx context.Context, dir string, _cmds ...string) error {
@@ -12,6 +14,8 @@ func (m *maker) RunCommand(ctx context.Context, dir string, _cmds ...string) err
 		return nil
 	}
 
+	logger.Debug("maker.RunCommand: dir = %s, cmds = %v", dir, _cmds)
+
 	for _, cmdStr := range _cmds {
 		cmd := exec.CommandContext(ctx, "sh", "-c", cmdStr)
 

internal/controller/maker/configmap.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"github.com/samber/lo"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
 	"yizhisec.com/hsv2/forge/pkg/extractor"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/tool/random"
 )
 

internal/controller/maker/elastic.go

@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/internal/opt"
 	"yizhisec.com/hsv2/forge/pkg/archiver"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )

internal/controller/maker/emqx.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )

internal/controller/maker/flannel.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )

internal/controller/maker/hsnet.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/archiver"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/image.go

@@ -6,8 +6,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"github.com/samber/lo"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/image_test.go

@@ -3,7 +3,7 @@ package maker
 import (
 	"testing"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 )
 
 func TestImage(t *testing.T) {

internal/controller/maker/lessdns.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/longhorn.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/minio.go

@@ -6,7 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/internal/opt"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
@@ -14,20 +15,20 @@ import (
 // todo, remake minio-init image
 func (m *maker) Minio(ctx context.Context, storage string) error {
 	var (
-		err      error
-		location = filepath.Join(m.workdir, "dependency", "minio")
+		err     error
+		workdir = filepath.Join(m.workdir, "dependency", "minio")
 	)
 
-	logger.Info("☑️ maker.Minio: 开始构建 minio 依赖, workdir = %s", location)
-
-	logger.Debug("☑️ maker.Minio: 构建工作目录, workdir = %s", location)
-	if err = os.MkdirAll(location, 0755); err != nil {
-		logger.Debug("❌ maker.Minio: 创建工作目录失败, workdir = %s, err = %v", location, err)
+	logger.Info("☑️ maker.Minio: 开始构建 minio 依赖, workdir = %s", workdir)
+	logger.Debug("☑️ maker.Minio: 构建工作目录, workdir = %s", workdir)
+	_ = os.RemoveAll(workdir)
+	if err = os.MkdirAll(workdir, 0755); err != nil {
+		logger.Debug("❌ maker.Minio: 创建工作目录失败, workdir = %s, err = %v", workdir, err)
 		return err
 	}
-	logger.Debug("✅ maker.Minio: 创建工作目录成功, workdir = %s", location)
+	logger.Debug("✅ maker.Minio: 创建工作目录成功, workdir = %s", workdir)
 
-	filename := filepath.Join(location, "minio.yaml")
+	filename := filepath.Join(workdir, "minio.yaml")
 	logger.Debug("☑️ maker.Minio: 准备资源文件, filename = %s, storage = %s", filename, storage)
 	bs := []byte(fmt.Sprintf(resource.YAMLMinIO, storage))
 	if err = os.WriteFile(filename, bs, 0644); err != nil {
@@ -38,13 +39,13 @@ func (m *maker) Minio(ctx context.Context, storage string) error {
 
 	logger.Debug("☑️ maker.Minio: 开始获取所需镜像...")
 	var images = []*model.Image{
-		{Name: "hub.yizhisec.com/hybridscope/v3/minio-init:latest", Fallback: "", Save: "dep.minio-init.tar"},
-		{Name: "hub.yizhisec.com/external/minio:RELEASE.2025-03-12T18-04-18Z", Fallback: "", Save: "dep.minio.tar"},
+		{Name: opt.IMAGE_MINIO_BASE, Fallback: "", Save: "minio-init.tar"},
+		{Name: opt.IMAGE_MINIO, Fallback: "", Save: "minio.tar"},
 	}
 	for _, image := range images {
 		opts := []ImageOpt{
 			WithImageFallback(image.Fallback),
-			WithImageSave(filepath.Join(location, image.Save)),
+			WithImageSave(filepath.Join(workdir, image.Save)),
 			WithImageForcePull(image.Force),
 		}
 
@@ -56,7 +57,7 @@ func (m *maker) Minio(ctx context.Context, storage string) error {
 	}
 	logger.Debug("✅ maker.Minio: 获取所需镜像成功!!!")
 
-	logger.Info("✅ maker.Minio: 构建 minio 依赖成功, workdir = %s", location)
+	logger.Info("✅ maker.Minio: 构建 minio 依赖成功, workdir = %s", workdir)
 
 	return nil
 }

internal/controller/maker/mysql.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/internal/opt"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/proxy.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/redis.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/internal/opt"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 )
 

internal/controller/maker/registry.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
 

internal/controller/maker/seafile.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/internal/opt"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/model"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )
@@ -123,7 +123,7 @@ kubectl rollout restart deployment backup-seafile-deployment -n seafile`
 			ServerHostname: "cloud.hybridscope.com",
 			Storage:        "50Gi",
 		}
-    workdir = filepath.Join(m.workdir, "dependency", "seafile")
+		workdir = filepath.Join(m.workdir, "dependency", "seafile")
 	)
 
 	for _, fn := range opts {
@@ -187,7 +187,7 @@ kubectl rollout restart deployment backup-seafile-deployment -n seafile`
 
 	// 7. prepare images
 	logger.Debug("☑️ make.Seafile: 准备 images")
-    imgDir := filepath.Join(m.workdir, "dependency", "image")
+	imgDir := filepath.Join(m.workdir, "dependency", "image")
 	if err = os.MkdirAll(imgDir, 0755); err != nil {
 		logger.Error("❌ make.Seafile: 准备 images 目录: %s 失败, err = %v", imgDir, err)
 		return err

internal/controller/maker/yosguard.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"yizhisec.com/hsv2/forge/pkg/downloader"
+	"yizhisec.com/hsv2/forge/pkg/logger"
 	"yizhisec.com/hsv2/forge/pkg/resource"
 )