Merge pull request #202 from Random-Liu/fix-image-repo-digest

Fix repo digest for schema 1 image.

hack/test-e2e-node.sh

@@ -20,7 +20,6 @@ source $(dirname "${BASH_SOURCE[0]}")/test-utils.sh
 
 DEFAULT_SKIP="\[Flaky\]|\[Slow\]|\[Serial\]"
 DEFAULT_SKIP+="|querying\s\/stats\/summary"
-DEFAULT_SKIP+="|set\sto\sthe\smanifest\sdigest"
 DEFAULT_SKIP+="|AppArmor"
 DEFAULT_SKIP+="|pull\sfrom\sprivate\sregistry\swith\ssecret"
 

pkg/server/container_status.go

@@ -32,13 +32,23 @@ func (c *criContainerdService) ContainerStatus(ctx context.Context, r *runtime.C
 		return nil, fmt.Errorf("an error occurred when try to find container %q: %v", r.GetContainerId(), err)
 	}
 
+	imageRef := container.ImageRef
+	image, err := c.imageStore.Get(imageRef)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get image %q: %v", container.ImageRef, err)
+	}
+	if len(image.RepoDigests) > 0 {
+		// Based on the CRI definition, this field will be consumed by user.
+		imageRef = image.RepoDigests[0]
+	}
+
 	return &runtime.ContainerStatusResponse{
-		Status: toCRIContainerStatus(container),
+		Status: toCRIContainerStatus(container, imageRef),
 	}, nil
 }
 
 // toCRIContainerStatus converts internal container object to CRI container status.
-func toCRIContainerStatus(container containerstore.Container) *runtime.ContainerStatus {
+func toCRIContainerStatus(container containerstore.Container, imageRef string) *runtime.ContainerStatus {
 	meta := container.Metadata
 	status := container.Status.Get()
 	reason := status.Reason
@@ -58,7 +68,7 @@ func toCRIContainerStatus(container containerstore.Container) *runtime.Container
 		FinishedAt:  status.FinishedAt,
 		ExitCode:    status.ExitCode,
 		Image:       meta.Config.GetImage(),
-		ImageRef:    meta.ImageRef,
+		ImageRef:    imageRef,
 		Reason:      reason,
 		Message:     status.Message,
 		Labels:      meta.Config.GetLabels(),

pkg/server/container_status_test.go

@@ -25,9 +25,11 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
 	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
 )
 
-func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status, *runtime.ContainerStatus) {
+func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,
+	*imagestore.Image, *runtime.ContainerStatus) {
 	testID := "test-id"
 	config := &runtime.ContainerConfig{
 		Metadata: &runtime.ContainerMetadata{
@@ -51,13 +53,17 @@ func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Sta
 		Name:      "test-long-name",
 		SandboxID: "test-sandbox-id",
 		Config:    config,
-		ImageRef:  "test-image-ref",
+		ImageRef:  "test-image-id",
 	}
 	status := &containerstore.Status{
 		Pid:       1234,
 		CreatedAt: createdAt,
 		StartedAt: startedAt,
 	}
+	image := &imagestore.Image{
+		ID:          "test-image-id",
+		RepoDigests: []string{"test-image-repo-digest"},
+	}
 	expected := &runtime.ContainerStatus{
 		Id:          testID,
 		Metadata:    config.GetMetadata(),
@@ -65,14 +71,14 @@ func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Sta
 		CreatedAt:   createdAt,
 		StartedAt:   startedAt,
 		Image:       config.GetImage(),
-		ImageRef:    "test-image-ref",
+		ImageRef:    "test-image-repo-digest",
 		Reason:      completeExitReason,
 		Labels:      config.GetLabels(),
 		Annotations: config.GetAnnotations(),
 		Mounts:      config.GetMounts(),
 	}
 
-	return metadata, status, expected
+	return metadata, status, image, expected
 }
 
 func TestToCRIContainerStatus(t *testing.T) {
@@ -110,7 +116,7 @@ func TestToCRIContainerStatus(t *testing.T) {
 			expectedReason: errorExitReason,
 		},
 	} {
-		metadata, status, expected := getContainerStatusTestData()
+		metadata, status, image, expected := getContainerStatusTestData()
 		// Update status with test case.
 		status.FinishedAt = test.finishedAt
 		status.ExitCode = test.exitCode
@@ -124,13 +130,14 @@ func TestToCRIContainerStatus(t *testing.T) {
 		expected.FinishedAt = test.finishedAt
 		expected.ExitCode = test.exitCode
 		expected.Message = test.message
-		assert.Equal(t, expected, toCRIContainerStatus(container), desc)
+		assert.Equal(t, expected, toCRIContainerStatus(container, image.RepoDigests[0]), desc)
 	}
 }
 
 func TestContainerStatus(t *testing.T) {
 	for desc, test := range map[string]struct {
 		exist         bool
+		imageExist    bool
 		finishedAt    int64
 		reason        string
 		expectedState runtime.ContainerState
@@ -138,22 +145,30 @@ func TestContainerStatus(t *testing.T) {
 	}{
 		"container running": {
 			exist:         true,
+			imageExist:    true,
 			expectedState: runtime.ContainerState_CONTAINER_RUNNING,
 		},
 		"container exited": {
 			exist:         true,
+			imageExist:    true,
 			finishedAt:    time.Now().UnixNano(),
 			reason:        "test-reason",
 			expectedState: runtime.ContainerState_CONTAINER_EXITED,
 		},
 		"container not exist": {
-			exist:     false,
-			expectErr: true,
+			exist:      false,
+			imageExist: true,
+			expectErr:  true,
+		},
+		"image not exist": {
+			exist:      false,
+			imageExist: false,
+			expectErr:  true,
 		},
 	} {
 		t.Logf("TestCase %q", desc)
 		c := newTestCRIContainerdService()
-		metadata, status, expected := getContainerStatusTestData()
+		metadata, status, image, expected := getContainerStatusTestData()
 		// Update status with test case.
 		status.FinishedAt = test.finishedAt
 		status.Reason = test.reason
@@ -162,6 +177,9 @@ func TestContainerStatus(t *testing.T) {
 		if test.exist {
 			assert.NoError(t, c.containerStore.Add(container))
 		}
+		if test.imageExist {
+			c.imageStore.Add(*image)
+		}
 		resp, err := c.ContainerStatus(context.Background(), &runtime.ContainerStatusRequest{ContainerId: container.ID})
 		if test.expectErr {
 			assert.Error(t, err)

pkg/server/image_pull.go

@@ -89,6 +89,13 @@ func (c *criContainerdService) PullImage(ctx context.Context, r *runtime.PullIma
 		Credentials: func(string) (string, string, error) { return ParseAuth(r.GetAuth()) },
 		Client:      http.DefaultClient,
 	})
+	_, desc, err := resolver.Resolve(ctx, ref)
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve image %q: %v", ref, err)
+	}
+	// We have to check schema1 here, because after `Pull`, schema1
+	// image has already been converted.
+	isSchema1 := desc.MediaType == containerdimages.MediaTypeDockerSchema1Manifest
 
 	// TODO(mikebrow): add truncIndex for image id
 	image, err := c.client.Pull(ctx, ref,
@@ -100,7 +107,7 @@ func (c *criContainerdService) PullImage(ctx context.Context, r *runtime.PullIma
 	if err != nil {
 		return nil, fmt.Errorf("failed to pull image %q: %v", ref, err)
 	}
-	repoDigest, repoTag := getRepoDigestAndTag(namedRef, image.Target().Digest, image.Target().MediaType == containerdimages.MediaTypeDockerSchema1Manifest)
+	repoDigest, repoTag := getRepoDigestAndTag(namedRef, image.Target().Digest, isSchema1)
 	for _, r := range []string{repoTag, repoDigest} {
 		if r == "" {
 			continue