cri: fix using the pinned label to pin image

Iceber · Iceber · commit 8dc8618442ad · 2023-11-16T14:52:35.000+08:00
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io> (cherry picked from commit 7f7ba31) Signed-off-by: Iceber Gu <caiwei95@hotmail.com>
diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/integration/images"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/cri/labels"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -47,7 +48,8 @@ func TestContainerdImage(t *testing.T) {
 	}
 
 	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)
 	defer func() {
 		// Make sure the image is cleaned up in any case.
@@ -128,6 +130,13 @@ func TestContainerdImage(t *testing.T) {
 	img, err := containerdClient.GetImage(ctx, testImage)
 	assert.NoError(t, err)
 	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")
 	sb, sbConfig := PodSandboxConfigWithCleanup(t, "sandbox", "containerd-image")
diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go
@@ -213,6 +213,7 @@ func (s *store) add(img Image) error {
 	}
 	// Or else, merge and sort the references.
 	i.References = docker.Sort(util.MergeStringSlices(i.References, img.References))
+	i.Pinned = i.Pinned || img.Pinned
 	s.images[img.ID] = i
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,7 @@ func (s *store) add(img Image) error {`
`213`	`213`	`}`
`214`	`214`	`// Or else, merge and sort the references.`
`215`	`215`	`i.References = docker.Sort(util.MergeStringSlices(i.References, img.References))`
	`216`	`+ i.Pinned = i.Pinned \|\| img.Pinned`
`216`	`217`	`s.images[img.ID] = i`
`217`	`218`	`return nil`
`218`	`219`	`}`