add digest sub-flag for list image #163

yanxuean · 2017-10-19T01:24:03Z

fix #162
Signed-off-by: yanxuean yan.xuean@zte.com.cn

yanxuean · 2017-10-19T01:29:42Z

test case

root@ubuntu:/home/cloud/go/src/github.com/kubernetes-incubator/cri-tools# crictl images --digests
DEBU[0000] ListImagesRequest: &ListImagesRequest{Filter:&ImageFilter{Image:&ImageSpec{Image:,},},} 
DEBU[0000] ListImagesResponse: &ListImagesResponse{Images:[&Image{Id:sha256:54511612f1c4d97e93430fc3d5dc2f05dfbe8fb7e6259b7351deeca95eaf2971,RepoTags:[docker.io/library/busybox:latest],RepoDigests:[],Size_:719904,Uid:nil,Username:,} &Image{Id:sha256:b8d7834a2df3a323807d0b97aba3230c2ed7f41f990c971ebf78442649d814aa,RepoTags:[],RepoDigests:[docker.io/library/postgres@sha256:318757ed6291e6a1ef86312ac453b9b4a67b48495b59ca2dece909cb0c688c53],Size_:104133212,Uid:nil,Username:,} &Image{Id:sha256:320aedbfaad3d719b5e6a711834d2d06e2b0a172ce6fdadf84c640b6136914ed,RepoTags:[gcr.io/google_containers/pause:3.0],RepoDigests:[],Size_:312194,Uid:nil,Username:,} &Image{Id:sha256:c30178c5239f2937c21c261b0365efcda25be4921ccb95acd63beeeb78786f27,RepoTags:[docker.io/library/busybox:1.26],RepoDigests:[docker.io/library/busybox@sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642],Size_:701277,Uid:nil,Username:,}],} 
IMAGE                            TAG                 DIGEST                                                                    IMAGE ID            SIZE
docker.io/library/busybox        latest              <none>                                                                    54511612f1c4d       720kB
docker.io/library/postgres       <none>              sha256:318757ed6291e6a1ef86312ac453b9b4a67b48495b59ca2dece909cb0c688c53   b8d7834a2df3a       104MB
gcr.io/google_containers/pause   3.0                 <none>                                                                    320aedbfaad3d       312kB
docker.io/library/busybox        1.26                sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642   c30178c5239f2       701kB

yanxuean · 2017-10-19T02:04:11Z

/assign feiskyer
/assign random-liu

yanxuean · 2017-10-19T02:18:24Z

@feiskyer @Random-Liu PTAL

yanxuean · 2017-10-23T08:51:55Z

@Random-Liu @feiskyer PTAL

Random-Liu · 2017-10-23T09:29:39Z

cmd/crictl/image.go

 				}
+				repoDigest := normalizeRepoDigest(image.RepoDigests)
 				repoTagPairs := normalizeRepoTagPair(image.RepoTags, image.RepoDigests)
 				size := units.HumanSizeWithPrecision(float64(image.GetSize_()), 3)
 				trunctedImage := strings.TrimPrefix(image.Id, "sha256:")[:truncatedImageIDLen]
 				for _, repoTagPair := range repoTagPairs {


We should combine repoDigest list and repoTag list, so that we don't need to handle repo digest separately in normalizeRepoTagPair.

feiskyer

/lgtm

fix kubernetes-sigs#162 Signed-off-by: yanxuean <yan.xuean@zte.com.cn>

yanxuean · 2017-10-25T15:43:17Z

@Random-Liu PTAL

Random-Liu · 2017-10-26T01:09:45Z

@yanxuean

If we have an image that has both repo tag a:b and repo digest a@sha256:c, I guess docker images shows a b and docker images --digest shows a b c.
If we have an image that only has repo digest a@sha256:c, I guess docker images shows a <none> and docker images --digest shows a <none> c.
If we have an image that has 2 repo tags a:b1 and a:b2 and repo digest a@sha256:c, I guess docker images shows a b1 and a b1, and docker images --digest shows a b1 c and a b2 c.
Will an image have 2 repo digests? (I don't think it will happen in anytime soon, so I think we could ignore this case for now and assume an image only has one repo digest).

If my assumption above is correct, then it seems that 2) is not handled in this PR. @yanxuean Please first make sure my assumption is correct, I'm not sure about it actually. :)

We only need to:

pass both repoTags and repoDigests into a function.
The function should return a list of (id, tag, digest).
If the image has repoTags, then the list only need to contain (id, tag, digest) for all repoTags.
If the image doesn't have repoTags, then the list should contain (id, <none>, digest) for repoDigests.

feiskyer · 2017-10-27T03:09:35Z

@Random-Liu Could you find some example images to convert those cases?

Random-Liu · 2017-10-27T17:31:38Z

Note that I removed all busybox image before each case.

Case 1:

$ docker pull busybox:latest
$ docker pull busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7
$ docker images | grep busybox
busybox                                                     latest                               54511612f1c4        6 weeks ago         1.129 MB
$ docker images --digest | grep busybox
busybox                                                     latest                               sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7   54511612f1c4        6 weeks ago         1.129 MB

Case 2:

$ docker pull busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7
$ docker images | grep busybox
busybox                                                     <none>                               54511612f1c4        6 weeks ago         1.129 MB
$ docker images --digests | grep busybox
busybox                                                     <none>                               sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7   54511612f1c4        6 weeks ago         1.129 MB

Case 3:

$ docker pull busybox:latest
$ docker pull busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7
$ docker pull busybox:1.27.2
$ docker images | grep busybox
busybox                                                     1.27.2                               54511612f1c4        6 weeks ago         1.129 MB
busybox                                                     latest                               54511612f1c4        6 weeks ago         1.129 MB
$ docker images --digests | grep busybox
busybox                                                     1.27.2                               sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7   54511612f1c4        6 weeks ago         1.129 MB
busybox                                                     latest                               sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7   54511612f1c4        6 weeks ago         1.129 MB

In this PR case 2 is not handled.

As I mentioned, we should do:

Pass both repoTags and repoDigests into a function.
The function should return a list of (id, tag, digest).
If the image has repoTags, then the list only need to contain (id, tag, digest) for all repoTags.
If the image doesn't have repoTags, then the list should contain (id, , digest) for repoDigests.

yanxuean · 2017-10-28T07:43:00Z

ok, I will study it late.

yanxuean · 2017-10-28T07:51:26Z

The case 2 has been handled.
see the second case below:

root@ubuntu:/home/cloud/go/src/github.com/kubernetes-incubator/cri-tools# crictl images --digests
DEBU[0000] ListImagesRequest: &ListImagesRequest{Filter:&ImageFilter{Image:&ImageSpec{Image:,},},} 
DEBU[0000] ListImagesResponse: &ListImagesResponse{Images:[&Image{Id:sha256:54511612f1c4d97e93430fc3d5dc2f05dfbe8fb7e6259b7351deeca95eaf2971,RepoTags:[docker.io/library/busybox:latest],RepoDigests:[],Size_:719904,Uid:nil,Username:,} &Image{Id:sha256:b8d7834a2df3a323807d0b97aba3230c2ed7f41f990c971ebf78442649d814aa,RepoTags:[],RepoDigests:[docker.io/library/postgres@sha256:318757ed6291e6a1ef86312ac453b9b4a67b48495b59ca2dece909cb0c688c53],Size_:104133212,Uid:nil,Username:,} &Image{Id:sha256:320aedbfaad3d719b5e6a711834d2d06e2b0a172ce6fdadf84c640b6136914ed,RepoTags:[gcr.io/google_containers/pause:3.0],RepoDigests:[],Size_:312194,Uid:nil,Username:,} &Image{Id:sha256:c30178c5239f2937c21c261b0365efcda25be4921ccb95acd63beeeb78786f27,RepoTags:[docker.io/library/busybox:1.26],RepoDigests:[docker.io/library/busybox@sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642],Size_:701277,Uid:nil,Username:,}],} 
IMAGE                            TAG                 DIGEST                                                                    IMAGE ID            SIZE
docker.io/library/busybox        latest              <none>                                                                    54511612f1c4d       720kB
docker.io/library/postgres       <none>              sha256:318757ed6291e6a1ef86312ac453b9b4a67b48495b59ca2dece909cb0c688c53   b8d7834a2df3a       104MB
gcr.io/google_containers/pause   3.0                 <none>                                                                    320aedbfaad3d       312kB
docker.io/library/busybox        1.26                sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642   c30178c5239f2       701kB

Random-Liu · 2017-10-28T18:20:06Z

@yanxuean Sorry, I missed that part. Then we are handling all the cases I could come up with. Thanks!

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 19, 2017

yanxuean force-pushed the digest branch from 0625532 to a3f8a0b Compare October 19, 2017 02:03

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 19, 2017

k8s-ci-robot assigned feiskyer and Random-Liu Oct 19, 2017

Random-Liu reviewed Oct 23, 2017

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 23, 2017

feiskyer approved these changes Oct 23, 2017

View reviewed changes

yanxuean force-pushed the digest branch from a3f8a0b to ee8c61e Compare October 23, 2017 11:56

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 23, 2017

add digest sub-flag for list image

ee8c61e

fix kubernetes-sigs#162 Signed-off-by: yanxuean <yan.xuean@zte.com.cn>

Random-Liu merged commit 8e989f8 into kubernetes-sigs:master Oct 28, 2017

yanxuean deleted the digest branch October 30, 2017 00:30

spiffxp unassigned Random-Liu Sep 6, 2018

yanhuan0802 mentioned this pull request Apr 17, 2023

cri-tools 1.26.0 pull image error #1137

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add digest sub-flag for list image #163

add digest sub-flag for list image #163

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 23, 2017

Random-Liu Oct 23, 2017

yanxuean Oct 25, 2017

feiskyer left a comment

yanxuean commented Oct 25, 2017

Random-Liu commented Oct 26, 2017 •

edited

Loading

feiskyer commented Oct 27, 2017

Random-Liu commented Oct 27, 2017 •

edited

Loading

yanxuean commented Oct 28, 2017

yanxuean commented Oct 28, 2017

Random-Liu commented Oct 28, 2017

add digest sub-flag for list image #163

add digest sub-flag for list image #163

Conversation

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 19, 2017

yanxuean commented Oct 23, 2017

Random-Liu Oct 23, 2017

Choose a reason for hiding this comment

yanxuean Oct 25, 2017

Choose a reason for hiding this comment

feiskyer left a comment

Choose a reason for hiding this comment

yanxuean commented Oct 25, 2017

Random-Liu commented Oct 26, 2017 • edited Loading

feiskyer commented Oct 27, 2017

Random-Liu commented Oct 27, 2017 • edited Loading

yanxuean commented Oct 28, 2017

yanxuean commented Oct 28, 2017

Random-Liu commented Oct 28, 2017

Random-Liu commented Oct 26, 2017 •

edited

Loading

Random-Liu commented Oct 27, 2017 •

edited

Loading