feat: 🏡 make apps

internal/controller/maker/image.go

@@ -9,6 +9,7 @@ import (
 	"gitea.loveuer.com/yizhisec/pkg3/logger"
 	"github.com/samber/lo"
 	"yizhisec.com/hsv2/forge/internal/opt"
+	"yizhisec.com/hsv2/forge/pkg/model"
 )
 
 type imageOpt struct {
@@ -32,9 +33,11 @@ func WithImageSave(filename string) ImageOpt {
 	}
 }
 
-func WithImageForcePull() ImageOpt {
+func WithImageForcePull(force bool) ImageOpt {
 	return func(o *imageOpt) {
-		o.ForcePull = true
+		if force {
+			o.ForcePull = true
+		}
 	}
 }
 
@@ -107,14 +110,8 @@ SAVE:
 }
 
 func (m *maker) Images(ctx context.Context) error {
-	type Images struct {
-		Name     string
-		Fallback string
-		Save     string
-		Force    bool
-	}
 
-	var images = []*Images{
+	var images = []*model.Image{
 		{Name: "quay.io/k0sproject/apiserver-network-proxy-agent:v0.32.0", Fallback: "hub.yizhisec.com/external/apiserver-network-proxy-agent:v0.32.0", Save: "k0s.apiserver-network-proxy-agent.tar"},
 		{Name: "quay.io/k0sproject/cni-node:1.7.1-k0s.0", Fallback: "", Save: "k0s.cni-node.tar"},
 		{Name: "quay.io/k0sproject/coredns:1.12.2", Fallback: "", Save: "k0s.coredns.tar"},
@@ -173,10 +170,7 @@ func (m *maker) Images(ctx context.Context) error {
 		opts := []ImageOpt{
 			WithImageFallback(image.Fallback),
 			WithImageSave(image.Save),
-		}
-
-		if image.Force {
-			opts = append(opts, WithImageForcePull())
+			WithImageForcePull(image.Force),
 		}
 
 		logger.Info("☑️ 获取镜像: %s", image.Name)