[mirror] Support mirroring of modules without images

Signed-off-by: Maxim Vasilenko <maksim.vasilenko@flant.com>
deckhouse · May 30, 2024 · 4307e1a · 4307e1a
1 parent 4abab07
commit 4307e1a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/internal/mirror/layouts/layouts.go b/internal/mirror/layouts/layouts.go
@@ -18,7 +18,9 @@ package layouts
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -249,8 +251,11 @@ func FindDeckhouseModulesImages(mirrorCtx *contexts.PullContext, layouts *ImageL
 			}
 
 			imagesDigestsJSON, err := images.ExtractFileFromImage(img, "images_digests.json")
-			if err != nil {
-				return fmt.Errorf("get digests for %q version: %w", imageTag, err)
+			switch {
+			case errors.Is(err, fs.ErrNotExist):
+				continue
+			case err != nil:
+				return fmt.Errorf("extract digests for %q version: %w", imageTag, err)
 			}
 
 			digests := images.ExtractDigestsFromJSONFile(imagesDigestsJSON.Bytes())

diff --git a/internal/mirror/modules/modules.go b/internal/mirror/modules/modules.go
@@ -17,7 +17,9 @@ limitations under the License.
 package modules
 
 import (
+	"errors"
 	"fmt"
+	"io/fs"
 
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
@@ -155,8 +157,11 @@ func FindExternalModuleImages(
 		}
 
 		imagesDigestsJSON, err := images.ExtractFileFromImage(img, "images_digests.json")
-		if err != nil {
-			return nil, nil, fmt.Errorf("Get digests for %q version: %w", imageTag, err)
+		switch {
+		case errors.Is(err, fs.ErrNotExist):
+			continue
+		case err != nil:
+			return nil, nil, fmt.Errorf("Extract digests for %q version: %w", imageTag, err)
 		}
 
 		digests := images.ExtractDigestsFromJSONFile(imagesDigestsJSON.Bytes())