github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

CRI: Move reference sorting to reference package

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2022-05-26 12:52:36 -07:00
parent b5366f8d7e
commit e44335800e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/store/image/image.go
View File

@ -24,6 +24,7 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/cri/util"
"github.com/containerd/containerd/reference"
imagedigest "github.com/opencontainers/go-digest" imagedigest "github.com/opencontainers/go-digest"
"github.com/opencontainers/go-digest/digestset" "github.com/opencontainers/go-digest/digestset"
@ -205,7 +206,7 @@ func (s *store) add(img Image) error {
return nil return nil
} }
// Or else, merge and sort the references. // 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 s.images[img.ID] = i
return nil return nil
} }

6
pkg/cri/store/image/sort.go → reference/sort.go
View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package image package reference
import ( import (
"sort" "sort"
@ -22,8 +22,8 @@ import (
"github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/reference/docker"
) )
// sortReferences sorts references by refRank then string comparison // Sort sorts references by refRank then string comparison
func sortReferences(references []string) []string { func Sort(references []string) []string {
var prefs []docker.Reference var prefs []docker.Reference
var bad []string var bad []string

4
pkg/cri/store/image/sort_test.go → reference/sort_test.go
View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package image package reference
import ( import (
"io" "io"
@ -68,7 +68,7 @@ func TestReferenceSorting(t *testing.T) {
expected: []string{r2("name-1", "tag"), r2("name-2", "tag"), r2("name-3", "tag")}, 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) { if len(sorted) != len(tc.expected) {
t.Errorf("[%d]: Mismatched sized, got %d, expected %d", i, len(sorted), len(tc.expected)) t.Errorf("[%d]: Mismatched sized, got %d, expected %d", i, len(sorted), len(tc.expected))
continue continue