Add image tag used by container for crictl ps and add attempt for crictl ps/sandboxes
#187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
miaoyq
force-pushed
the
add-image-tag-for-crictl-ps
branch
from
5515c25
to
d2267f3
Compare
miaoyq
changed the title
crictl pscrictl ps and add attempt for crictl ps/sandboxes
Random-Liu
reviewed
Nov 8, 2017
cmd/crictl/container.go
Outdated
| @@ -592,3 +594,12 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error { | |||
| w.Flush() | |||
| return nil | |||
| } | |||
|
|
|||
| func getImageRef(c *pb.Container) string { | |||
There was a problem hiding this comment.
Actually in current CRI implementation c.Image.Image should mostly be image tag, I don't think you want to truncate it.
See:
- https://github.com/kubernetes-incubator/cri-containerd/blob/master/pkg/server/container_status.go#L49
- https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/dockershim/docker_container.go#L375
I think we could show the c.Image.Image directly.
There was a problem hiding this comment.
Still show c.Image.Image directly if c.Image.Image is imageID?
|
LGTM overall, please paste the output, rebase and address comments. |
miaoyq
force-pushed
the
add-image-tag-for-crictl-ps
branch
from
d2267f3
to
7c47d05
Compare
|
@Random-Liu Updated. # crictl ps
CONTAINER ID IMAGE CREATED STATE NAME ATTEMPT
d67cc2866acff gcr.io/google_containers/kube-proxy-amd64@sha256:58fd496116bf3d2790279f9c44040bdfa71791aba7a7a1b5ca35025b5a032b9f 2 weeks ago CONTAINER_RUNNING kube-proxy 0
d7991a3ccae38 docker.io/library/busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7 About an hour ago CONTAINER_EXITED busybox 147
757fc432b9e10 docker.io/library/busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7 About an hour ago CONTAINER_EXITED busybox 280
c87e53334fc9b docker.io/library/busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7 23 minutes ago CONTAINER_RUNNING busybox 148
e3e809d23abaf docker.io/library/busybox@sha256:3e8fa85ddfef1af9ca85a5cfb714148956984e02f00bec3f7f49d3925a91e0e7 20 minutes ago CONTAINER_RUNNING busybox 281# crictl sandboxes
SANDBOX ID CREATED STATE NAME NAMESPACE ATTEMPT
41555a4bd665d 11 days ago SANDBOX_READY busybox default 0
cce6f4f601d44 2 weeks ago SANDBOX_READY kube-proxy-gwb2k kube-system 0
432374d9dfa61 6 days ago SANDBOX_READY busybox myq 0 |
…crictl ps/sandboxes` Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
|
/lgtm |
k8s-ci-robot
added
the
lgtm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #184 #185
/assign @Random-Liu
Signed-off-by: Yanqiang Miao miao.yanqiang@zte.com.cn