feat: support extend require images

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

Author: zwtop

model/plugin.go

@@ -21,13 +21,19 @@ import "time"
 // PluginInstanceDefinition contains container definitions about how
 // to install a plugin instance
 type PluginInstanceDefinition struct {
+	ExtraRequireImages []ExtraRequireImage   `yaml:"extra_require_images,omitempty"`
 	PrecheckContainers []ContainerDefinition `yaml:"precheck_containers,omitempty"`
 	InitContainers     []ContainerDefinition `yaml:"init_containers,omitempty"`
 	Containers         []ContainerDefinition `yaml:"containers"`
 	PostContainers     []ContainerDefinition `yaml:"post_containers,omitempty"`
 	CleanContainers    []ContainerDefinition `yaml:"clean_containers,omitempty"`
 }
 
+type ExtraRequireImage struct {
+	Name   string `yaml:"name"`
+	Unpack bool   `yaml:"unpack,omitempty"`
+}
+
 type ContainerDefinition struct {
 	Name          string                  `yaml:"name"`
 	Image         string                  `yaml:"image"`

plugin/executor.go

@@ -184,6 +184,14 @@ func (w *executor) Apply(ctx context.Context) error {
 		return fmt.Errorf("config container runtime: %s", err)
 	}
 
+	requireImages := lo.Union(
+		lo.Map(w.instance.ExtraRequireImages, func(e model.ExtraRequireImage, _ int) string { return e.Name }),
+		lo.Map(w.instance.PrecheckContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.InitContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.Containers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.PostContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.CleanContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+	)
 	err = w.uploadContainerImages(ctx, append(append(w.instance.InitContainers, w.instance.Containers...), w.instance.PostContainers...)...)
 	if err != nil {
 		return fmt.Errorf("upload container images: %s", err)
@@ -224,7 +232,15 @@ func (w *executor) Apply(ctx context.Context) error {
 		return fmt.Errorf("start post containers: %s", err)
 	}
 
-	err = w.removeUnusedImages(ctx, w.instance.Containers...)
+	inuseImages := lo.Union(
+		lo.Map(w.instance.ExtraRequireImages, func(e model.ExtraRequireImage, _ int) string { return e.Name }),
+		lo.Map(w.instance.PrecheckContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.InitContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.Containers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.PostContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+		lo.Map(w.instance.CleanContainers, func(c model.ContainerDefinition, _ int) string { return c.Image }),
+	)
+	err = w.removeUnusedImages(ctx, inuseImages...)
 	if err != nil {
 		return fmt.Errorf("remove unused images: %s", err)
 	}
@@ -543,7 +559,7 @@ func (w *executor) removeAllInNamespace(ctx context.Context) error {
 	return nil
 }
 
-func (w *executor) removeUnusedImages(ctx context.Context, exceptImagesInContainer ...model.ContainerDefinition) error {
+func (w *executor) removeUnusedImages(ctx context.Context, inuseImages ...string) error {
 	images, err := w.runtime.ListImages(ctx)
 	if err != nil {
 		return err
@@ -553,10 +569,7 @@ func (w *executor) removeUnusedImages(ctx context.Context, exceptImagesInContain
 	for _, i := range images {
 		imageSet.Insert(i.Name)
 	}
-
-	for _, c := range exceptImagesInContainer {
-		imageSet.Delete(c.Image)
-	}
+	imageSet.Delete(inuseImages...)
 
 	for _, image := range imageSet.List() {
 		w.Infof("remove image %s from containerd", image)