[deckhouse-cli] fix extra push (#221)

Signed-off-by: Pavel Okhlopkov <[email protected]>

Author: ldmonster

pkg/libmirror/layouts/pull.go

@@ -256,7 +256,7 @@ func PullImageSet(
 					layout.WithPlatform(v1.Platform{Architecture: "amd64", OS: "linux"}),
 					layout.WithAnnotations(map[string]string{
 						"org.opencontainers.image.ref.name": imageReferenceString,
-						"io.deckhouse.image.short_tag":      extractExtraImageShortTag(imageReferenceString),
+						"io.deckhouse.image.short_tag":      tag,
 					}),
 				)
 				if err != nil {
@@ -281,20 +281,6 @@ func splitImageRefByRepoAndTag(imageReferenceString string) (string, string) {
 	return repo, tag
 }
 
-// extractExtraImageShortTag extracts the image name and tag for extra images
-func extractExtraImageShortTag(imageReferenceString string) string {
-	const extraPrefix = "/extra/"
-
-	if extraIndex := strings.LastIndex(imageReferenceString, extraPrefix); extraIndex != -1 {
-		// Extra image: return "imageName:tag" part after "/extra/"
-		return imageReferenceString[extraIndex+len(extraPrefix):]
-	}
-
-	// Regular image: return just the tag
-	_, tag := splitImageRefByRepoAndTag(imageReferenceString)
-	return tag
-}
-
 type pullImageSetOptions struct {
 	tagToDigestMapper TagToDigestMappingFunc
 	allowMissingTags  bool

pkg/libmirror/layouts/push.go

@@ -19,7 +19,6 @@ package layouts
 import (
 	"context"
 	"fmt"
-	"strings"
 	"sync"
 	"time"
 
@@ -62,21 +61,6 @@ func PushLayoutToRepo(
 	)
 }
 
-// buildExtraImageRef builds the correct image reference for extra images
-func buildExtraImageRef(registryRepo, tag string) string {
-	if strings.Contains(registryRepo, "/extra") && strings.Contains(tag, ":") {
-		// This is an extra image with format "imageName:tag"
-		// Split tag into image name and actual tag
-		parts := strings.SplitN(tag, ":", 2)
-		if len(parts) == 2 {
-			imageName, imageTag := parts[0], parts[1]
-			return registryRepo + "/" + imageName + ":" + imageTag
-		}
-	}
-	// Regular image or fallback
-	return registryRepo + ":" + tag
-}
-
 func PushLayoutToRepoContext(
 	ctx context.Context,
 	client pkg.RegistryClient,
@@ -112,7 +96,9 @@ func PushLayoutToRepoContext(
 	for _, manifestSet := range batches {
 		if parallelismConfig.Images == 1 {
 			tag := manifestSet[0].Annotations["io.deckhouse.image.short_tag"]
-			imageRef := buildExtraImageRef(registryRepo, tag)
+
+			imageRef := registryRepo + ":" + tag
+
 			logger.Infof("[%d / %d] Pushing image %s", imagesCount, len(indexManifest.Manifests), imageRef)
 			if err = pushImage(ctx, client, registryRepo, index, manifestSet[0], refOpts, remoteOpts, logger); err != nil {
 				return fmt.Errorf("Push Image: %w", err)
@@ -125,7 +111,7 @@ func PushLayoutToRepoContext(
 			logger.InfoLn("Images in batch:")
 			for _, manifest := range manifestSet {
 				tag := manifest.Annotations["io.deckhouse.image.short_tag"]
-				logger.Infof("- %s", buildExtraImageRef(registryRepo, tag))
+				logger.Infof("- %s", registryRepo+":"+tag)
 			}
 
 			errMu := &sync.Mutex{}
@@ -161,7 +147,7 @@ func pushImage(
 	_ params.Logger,
 ) error {
 	tag := manifest.Annotations["io.deckhouse.image.short_tag"]
-	imageRef := buildExtraImageRef(registryRepo, tag)
+	imageRef := registryRepo + ":" + tag
 	img, err := index.Image(manifest.Digest)
 	if err != nil {
 		return fmt.Errorf("Read image: %v", err)

pkg/libmirror/modules/modules.go

@@ -82,6 +82,20 @@ func getModulesForRepo(
 
 	result := make([]Module, 0, len(modules))
 	for _, module := range modules {
+		// if len(flags.ModulesWhitelist) > 0 {
+		// 	isWhitelisted := false
+
+		// 	for _, whitelisted := range flags.ModulesWhitelist {
+		// 		if module == whitelisted {
+		// 			isWhitelisted = true
+		// 		}
+		// 	}
+
+		// 	if !isWhitelisted {
+		// 		continue
+		// 	}
+		// }
+
 		m := Module{
 			Name:         module,
 			RegistryPath: path.Join(repo, module),
@@ -295,6 +309,8 @@ func FindModuleExtraImages(
 
 		// Convert to full registry paths with tags
 		for imageName, tagValue := range extraImagesRaw {
+			logger.Debugf("Found extra image %s with tag %v", imageName, tagValue)
+
 			var imageTag string
 
 			switch v := tagValue.(type) {
@@ -307,6 +323,9 @@ func FindModuleExtraImages(
 			}
 
 			fullImagePath := path.Join(mod.RegistryPath, "extra", imageName) + ":" + imageTag
+
+			logger.Debugf("Constructed full extra image path: %s", fullImagePath)
+
 			extraImages[fullImagePath] = struct{}{}
 		}
 

pkg/registry/image/layout.go

@@ -109,7 +109,7 @@ func (l *ImageLayout) AddImage(img pkg.RegistryImage, tag string) error {
 		layout.WithPlatform(l.defaultPlatform),
 		layout.WithAnnotations(map[string]string{
 			AnnotationImageReferenceName: meta.GetTagReference(),
-			AnnotationImageShortTag:      extractExtraImageShortTag(meta.GetTagReference()),
+			AnnotationImageShortTag:      tag,
 		}),
 	)
 	if err != nil {
@@ -199,17 +199,3 @@ func SplitImageRefByRepoAndTag(imageReferenceString string) (string, string) {
 
 	return repo, tag
 }
-
-func extractExtraImageShortTag(imageReferenceString string) string {
-	const extraPrefix = "/extra/"
-
-	if extraIndex := strings.LastIndex(imageReferenceString, extraPrefix); extraIndex != -1 {
-		// Extra image: return "imageName:tag" part after "/extra/"
-		return imageReferenceString[extraIndex+len(extraPrefix):]
-	}
-
-	// Regular image: return just the tag
-	_, tag := SplitImageRefByRepoAndTag(imageReferenceString)
-
-	return tag
-}