feat: 添加了 imager 工具 package
refactor: 将 images 的获取分散到各个组件里面
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"gitea.loveuer.com/yizhisec/pkg3/logger"
|
||||
"yizhisec.com/hsv2/forge/pkg/model"
|
||||
"yizhisec.com/hsv2/forge/pkg/resource"
|
||||
)
|
||||
|
||||
@@ -33,6 +34,27 @@ func (m *maker) Flannel(ctx context.Context, mode string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
var images = []*model.Image{
|
||||
{Name: "ghcr.io/flannel-io/flannel:v0.27.4", Fallback: "swr.cn-north-4.myhuaweicloud.com/ddn-k8s/ghcr.io/flannel-io/flannel:v0.27.4", Save: "flannel.tar"},
|
||||
{Name: "ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1", Fallback: "swr.cn-north-4.myhuaweicloud.com/ddn-k8s/ghcr.io/flannel-io/flannel-cni-plugin:v1.8.0-flannel1", Save: "flannel-cni-plugin.tar"},
|
||||
}
|
||||
|
||||
logger.Debug("MakeFlannel: 开始获取镜像...")
|
||||
for _, image := range images {
|
||||
opts := []ImageOpt{
|
||||
WithImageFallback(image.Fallback),
|
||||
WithImageSave(filepath.Join(location, image.Save)),
|
||||
WithImageForcePull(image.Force),
|
||||
}
|
||||
|
||||
if err := m.Image(ctx, image.Name, opts...); err != nil {
|
||||
logger.Error("❌ MakeFlannel: 获取镜像失败: %s, 可以手动获取后重试", image.Name)
|
||||
logger.Debug("❌ MakeFlannel: 获取镜像失败: %s, %v", image.Name, err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
logger.Debug("MakeFlannel: 获取镜像成功!!!")
|
||||
|
||||
logger.Info("✅ 构建 flannel 成功!!!")
|
||||
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user