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

cri: fix using the pinned label to pin image

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu 2023-07-25 18:28:00 +08:00
parent 8348a8cecb
commit 7f7ba31b64
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration/containerd_image_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/cri/labels"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
@ -45,7 +46,8 @@ func TestContainerdImage(t *testing.T) {
} }
t.Logf("pull the image into containerd") t.Logf("pull the image into containerd")
_, err = containerdClient.Pull(ctx, testImage, containerd.WithPullUnpack, containerd.WithPullLabel("foo", "bar")) lbs := map[string]string{"foo": "bar", labels.PinnedImageLabelKey: labels.PinnedImageLabelValue}
_, err = containerdClient.Pull(ctx, testImage, containerd.WithPullUnpack, containerd.WithPullLabels(lbs))
assert.NoError(t, err) assert.NoError(t, err)
defer func() { defer func() {
// Make sure the image is cleaned up in any case. // Make sure the image is cleaned up in any case.
@ -126,6 +128,13 @@ func TestContainerdImage(t *testing.T) {
img, err := containerdClient.GetImage(ctx, testImage) img, err := containerdClient.GetImage(ctx, testImage)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, img.Labels()["foo"], "bar") assert.Equal(t, img.Labels()["foo"], "bar")
assert.Equal(t, img.Labels()[labels.ImageLabelKey], labels.ImageLabelValue)
t.Logf("the image should be pinned")
i, err = imageService.ImageStatus(&runtime.ImageSpec{Image: testImage})
require.NoError(t, err)
require.NotNil(t, i)
assert.True(t, i.Pinned)
t.Logf("should be able to start container with the image") t.Logf("should be able to start container with the image")
sb, sbConfig := PodSandboxConfigWithCleanup(t, "sandbox", "containerd-image") sb, sbConfig := PodSandboxConfigWithCleanup(t, "sandbox", "containerd-image")

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

@ -213,6 +213,7 @@ func (s *store) add(img Image) error {
} }
// Or else, merge and sort the references. // Or else, merge and sort the references.
i.References = docker.Sort(util.MergeStringSlices(i.References, img.References)) i.References = docker.Sort(util.MergeStringSlices(i.References, img.References))
i.Pinned = i.Pinned || img.Pinned
s.images[img.ID] = i s.images[img.ID] = i
return nil return nil
} }