Merge pull request #6993 from mxpv/images

mikebrow · web-flow · commit 8c27ce41930c · 2022-05-31T20:38:43.000-05:00
CRI: cleanup cri/store package
diff --git a/image.go b/image.go
@@ -64,6 +64,8 @@ type Image interface {
 	Metadata() images.Image
 	// Platform returns the platform match comparer. Can be nil.
 	Platform() platforms.MatchComparer
+	// Spec returns the OCI image spec for a given image.
+	Spec(ctx context.Context) (ocispec.Image, error)
 }
 
 type usageOptions struct {
@@ -279,6 +281,26 @@ func (i *image) IsUnpacked(ctx context.Context, snapshotterName string) (bool, e
 	return false, nil
 }
 
+func (i *image) Spec(ctx context.Context) (ocispec.Image, error) {
+	var ociImage ocispec.Image
+
+	desc, err := i.Config(ctx)
+	if err != nil {
+		return ociImage, fmt.Errorf("get image config descriptor: %w", err)
+	}
+
+	blob, err := content.ReadBlob(ctx, i.ContentStore(), desc)
+	if err != nil {
+		return ociImage, fmt.Errorf("read image config from content store: %w", err)
+	}
+
+	if err := json.Unmarshal(blob, &ociImage); err != nil {
+		return ociImage, fmt.Errorf("unmarshal image config %s: %w", blob, err)
+	}
+
+	return ociImage, nil
+}
+
 // UnpackConfig provides configuration for the unpack of an image
 type UnpackConfig struct {
 	// ApplyOpts for applying a diff to a snapshotter
diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go
@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/containerd/pkg/cri/store"
 	"github.com/containerd/containerd/pkg/cri/store/label"
 	"github.com/containerd/containerd/pkg/cri/store/stats"
-	"github.com/containerd/containerd/pkg/cri/store/truncindex"
+	"github.com/containerd/containerd/pkg/truncindex"
 
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
diff --git a/pkg/cri/store/errors.go b/pkg/cri/store/errors.go
diff --git a/pkg/cri/store/errors_test.go b/pkg/cri/store/errors_test.go
diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go
@@ -18,14 +18,13 @@ package image
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sync"
 
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/pkg/cri/util"
+	"github.com/containerd/containerd/reference"
 
 	imagedigest "github.com/opencontainers/go-digest"
 	"github.com/opencontainers/go-digest/digestset"
@@ -132,23 +131,20 @@ func getImage(ctx context.Context, i containerd.Image) (*Image, error) {
 	if err != nil {
 		return nil, fmt.Errorf("get image config descriptor: %w", err)
 	}
+
 	id := desc.Digest.String()
 
-	rb, err := content.ReadBlob(ctx, i.ContentStore(), desc)
+	spec, err := i.Spec(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("read image config from content store: %w", err)
-	}
-	var ociimage imagespec.Image
-	if err := json.Unmarshal(rb, &ociimage); err != nil {
-		return nil, fmt.Errorf("unmarshal image config %s: %w", rb, err)
+		return nil, fmt.Errorf("failed to get OCI image spec: %w", err)
 	}
 
 	return &Image{
 		ID:         id,
 		References: []string{i.Name()},
 		ChainID:    chainID.String(),
 		Size:       size,
-		ImageSpec:  ociimage,
+		ImageSpec:  spec,
 	}, nil
 }
 
@@ -210,7 +206,7 @@ func (s *store) add(img Image) error {
 		return nil
 	}
 	// Or else, merge and sort the references.
-	i.References = sortReferences(util.MergeStringSlices(i.References, img.References))
+	i.References = reference.Sort(util.MergeStringSlices(i.References, img.References))
 	s.images[img.ID] = i
 	return nil
 }
diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go
@@ -24,8 +24,8 @@ import (
 	"github.com/containerd/containerd/pkg/cri/store"
 	"github.com/containerd/containerd/pkg/cri/store/label"
 	"github.com/containerd/containerd/pkg/cri/store/stats"
-	"github.com/containerd/containerd/pkg/cri/store/truncindex"
 	"github.com/containerd/containerd/pkg/netns"
+	"github.com/containerd/containerd/pkg/truncindex"
 )
 
 // Sandbox contains all resources associated with the sandbox. All methods to
diff --git a/pkg/truncindex/truncindex.go b/pkg/truncindex/truncindex.go
diff --git a/reference/sort.go b/reference/sort.go
@@ -14,16 +14,16 @@
    limitations under the License.
 */
 
-package image
+package reference
 
 import (
 	"sort"
 
 	"github.com/containerd/containerd/reference/docker"
 )
 
-// sortReferences sorts references by refRank then string comparison
-func sortReferences(references []string) []string {
+// Sort sorts references by refRank then string comparison
+func Sort(references []string) []string {
 	var prefs []docker.Reference
 	var bad []string
 
diff --git a/reference/sort_test.go b/reference/sort_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package image
+package reference
 
 import (
 	"io"
@@ -68,7 +68,7 @@ func TestReferenceSorting(t *testing.T) {
 			expected: []string{r2("name-1", "tag"), r2("name-2", "tag"), r2("name-3", "tag")},
 		},
 	} {
-		sorted := sortReferences(tc.unsorted)
+		sorted := Sort(tc.unsorted)
 		if len(sorted) != len(tc.expected) {
 			t.Errorf("[%d]: Mismatched sized, got %d, expected %d", i, len(sorted), len(tc.expected))
 			continue

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/containerd/containerd/pkg/cri/store"`
`26`	`26`	`"github.com/containerd/containerd/pkg/cri/store/label"`
`27`	`27`	`"github.com/containerd/containerd/pkg/cri/store/stats"`
`28`		`- "github.com/containerd/containerd/pkg/cri/store/truncindex"`
	`28`	`+ "github.com/containerd/containerd/pkg/truncindex"`
`29`	`29`
`30`	`30`	`runtime "k8s.io/cri-api/pkg/apis/runtime/v1"`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`	`"github.com/containerd/containerd/pkg/cri/store"`
`25`	`25`	`"github.com/containerd/containerd/pkg/cri/store/label"`
`26`	`26`	`"github.com/containerd/containerd/pkg/cri/store/stats"`
`27`		`- "github.com/containerd/containerd/pkg/cri/store/truncindex"`
`28`	`27`	`"github.com/containerd/containerd/pkg/netns"`
	`28`	`+ "github.com/containerd/containerd/pkg/truncindex"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`// Sandbox contains all resources associated with the sandbox. All methods to`