1berry/spegel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement changes to Containerd to enable compatibility with k3s

Browse Source
This commit is contained in:
Philip Laine 2024-01-23 14:39:21 +01:00
parent deb6e61479
commit 6c02bc0903
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/oci/containerd.go
View File

@ -199,7 +199,7 @@ func (c *Containerd) GetImageDigests(ctx context.Context, img Image) ([]string,
var idx ocispec.Index
b, err := content.ReadBlob(ctx, client.ContentStore(), desc)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to read blob for manifest list: %w", err)
}
if err := json.Unmarshal(b, &idx); err != nil {
return nil, err
@ -220,7 +220,7 @@ func (c *Containerd) GetImageDigests(ctx context.Context, img Image) ([]string,
var manifest ocispec.Manifest
b, err := content.ReadBlob(ctx, client.ContentStore(), desc)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to read blob for manifest: %w", err)
}
if err := json.Unmarshal(b, &manifest); err != nil {
return nil, err

1
pkg/oci/containerd_test.go
View File

@ -243,6 +243,7 @@ func TestGetImageDigestsNoPlatform(t *testing.T) {
Name: "ghcr.io/xenitab/spegel:v0.0.8",
Digest: digest.Digest("sha256:e80e36564e9617f684eb5972bf86dc9e9e761216e0d40ff78ca07741ec70725a"),
}
_, err = c.GetImageDigests(context.TODO(), img)
require.EqualError(t, err, "failed to walk image manifests: could not find any platforms with local content in manifest list: sha256:e80e36564e9617f684eb5972bf86dc9e9e761216e0d40ff78ca07741ec70725a")
}

1
pkg/state/state.go
View File

@ -69,7 +69,6 @@ func all(ctx context.Context, ociClient oci.Client, router routing.Router, resol
if err != nil {
return err
}
metrics.AdvertisedKeys.Reset()
metrics.AdvertisedImages.Reset()
metrics.AdvertisedImageTags.Reset()