Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.6] cri: add pod uid annotation #7735

Conversation

mqasimsarfraz
Copy link
Contributor

This PR is cherry-pick for "cri: add pod uid annotation"

Testing done

Created an test pod in a Kubernetes environment with complied binaries, shows following annotations:

cat /run/containerd/io.containerd.runtime.v2.task/k8s.io/1733e7a76be7ee5c026275bb563de617e1e5723164a1f07903469a320d5a67a4/config.json
...
...
  "annotations": {
    "io.kubernetes.cri.container-name": "test-pod-9240",
    "io.kubernetes.cri.container-type": "container",
    "io.kubernetes.cri.image-name": "mirror.gcr.io/library/alpine:latest",
    "io.kubernetes.cri.sandbox-id": "08880aefad635b5735451d8e933536ca4d715378f3bd94cd35bc8cab77884095",
    "io.kubernetes.cri.sandbox-name": "test-pod-9240",
    "io.kubernetes.cri.sandbox-namespace": "default",
    "io.kubernetes.cri.sandbox-uid": "4fe556a4-0bd7-45be-966f-46e2cbf4c4ac"
  },
...
...

@k8s-ci-robot
Copy link

Hi @mqasimsarfraz. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dcantah
Copy link
Member

dcantah commented Nov 29, 2022

Do you mind doing the cherry-pick with the -x flag (it includes a blurb into the commit msg about what commit this was cherry-picked from). Otherwise LGTM if the CI's happy

Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
(cherry picked from commit 0c4d32c)
Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
@mqasimsarfraz mqasimsarfraz force-pushed the stable-add-sandbox-uid-annotation branch from 6e38b4c to 56593cc Compare November 29, 2022 15:11
@mqasimsarfraz
Copy link
Contributor Author

Do you mind doing the cherry-pick with the -x flag (it includes a blurb into the commit msg about what commit this was cherry-picked from). Otherwise LGTM if the CI's happy

Thanks for a quick review. Done!

@dmcgowan dmcgowan added this to Ready For Review in Code Review Nov 29, 2022
@mxpv mxpv merged commit 3b580ad into containerd:release/1.6 Nov 29, 2022
Code Review automation moved this from Ready For Review to Done Nov 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants