Skip to content

Commit 2a7b4fb

Browse files
authored
Merge pull request #18 from deckhouse/fix/mirror-imageless-modules
[mirror] Support mirroring of modules without images
2 parents 4abab07 + 4307e1a commit 2a7b4fb

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

internal/mirror/layouts/layouts.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ package layouts
1818

1919
import (
2020
"encoding/json"
21+
"errors"
2122
"fmt"
23+
"io/fs"
2224
"os"
2325
"path/filepath"
2426
"strings"
@@ -249,8 +251,11 @@ func FindDeckhouseModulesImages(mirrorCtx *contexts.PullContext, layouts *ImageL
249251
}
250252

251253
imagesDigestsJSON, err := images.ExtractFileFromImage(img, "images_digests.json")
252-
if err != nil {
253-
return fmt.Errorf("get digests for %q version: %w", imageTag, err)
254+
switch {
255+
case errors.Is(err, fs.ErrNotExist):
256+
continue
257+
case err != nil:
258+
return fmt.Errorf("extract digests for %q version: %w", imageTag, err)
254259
}
255260

256261
digests := images.ExtractDigestsFromJSONFile(imagesDigestsJSON.Bytes())

internal/mirror/modules/modules.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ limitations under the License.
1717
package modules
1818

1919
import (
20+
"errors"
2021
"fmt"
22+
"io/fs"
2123

2224
"github.com/google/go-containerregistry/pkg/authn"
2325
"github.com/google/go-containerregistry/pkg/name"
@@ -155,8 +157,11 @@ func FindExternalModuleImages(
155157
}
156158

157159
imagesDigestsJSON, err := images.ExtractFileFromImage(img, "images_digests.json")
158-
if err != nil {
159-
return nil, nil, fmt.Errorf("Get digests for %q version: %w", imageTag, err)
160+
switch {
161+
case errors.Is(err, fs.ErrNotExist):
162+
continue
163+
case err != nil:
164+
return nil, nil, fmt.Errorf("Extract digests for %q version: %w", imageTag, err)
160165
}
161166

162167
digests := images.ExtractDigestsFromJSONFile(imagesDigestsJSON.Bytes())

0 commit comments

Comments
 (0)