From 7f7ba31b649f0d3224bd780e17f264f1ef4c3833 Mon Sep 17 00:00:00 2001 From: Iceber Gu Date: Tue, 25 Jul 2023 18:28:00 +0800 Subject: [PATCH] cri: fix using the pinned label to pin image Signed-off-by: Iceber Gu --- integration/containerd_image_test.go | 11 ++++++++++- pkg/cri/store/image/image.go | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 6fc0c049e..2b2ead081 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -27,6 +27,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" @@ -45,7 +46,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. @@ -126,6 +128,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 index 458fbbb56..5c8f661d6 100644 --- 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 }