-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
CRI Pinned image support #7944
CRI Pinned image support #7944
Conversation
Hi @adisky. 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 Once the patch is verified, the new status will be reflected by the 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 Thanks for review, do you have any idea why sandboxed tests are getting failed? they are failing in general or only on this PR? |
7e14ed8
to
4050a20
Compare
The sandboxed test will run the same integration test with sandbox servers. So I think you need to make the same changes on pkg/cri/sbserver as well. |
The new test you added is failing:
@ruiwen-zhao is correct; the test will run for both the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the same set of changes for image_pull in server package done to the sbserver also?
4050a20
to
68c9ead
Compare
@ruiwen-zhao @samuelkarp |
The proposal is here: #4131. I am not sure if we have removed the requirement for pause container with current implementation. I think the current requirement is that all new changes to cri/server will need to be made on cri/sbserver as well. You just need to copy your changes under cri/server over to cri/sbserver. |
68c9ead
to
3440baa
Compare
@ruiwen-zhao @pacoxu can you take a look again? added implementation to sbserver as well |
Thanks @adisky for updating the code! Looks good except for one comment above. |
/ok-to-test |
3440baa
to
37fa6c2
Compare
looks like flake |
/test pull-containerd-node-e2e |
cri-o related PR cri-o/cri-o#6903 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM on green w/rebase
@adisky sorry looks like another merge conflict on helpers.go could you rebase one more time :) |
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
Thank @mikebrow for review, rebased Also linking the discussion we had on containerd slack |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks @ruiwen-zhao for opening #8718 and #8720. |
…/main Merge upstream containerd/main at commit 5d1ab01 into ado fork-external/main Related work items: containerd#7944, containerd#8174, containerd#8334, containerd#8362, containerd#8572, containerd#8582, containerd#8588, containerd#8605, containerd#8606, containerd#8617, containerd#8619, containerd#8626, containerd#8627, containerd#8633, containerd#8637, containerd#8641, containerd#8643, containerd#8645, containerd#8652, containerd#8667, containerd#8672, containerd#8673, containerd#8676, containerd#8680, containerd#8684, containerd#8685, containerd#8692, containerd#8696, containerd#8697, containerd#8701, containerd#8708, containerd#8717, containerd#8726, containerd#8728, containerd#8729, containerd#8731, containerd#8732, containerd#8740, containerd#8752, containerd#8758, containerd#8762, containerd#8764
Signed-off-by: Aditi Sharma adi.sky17@gmail.com
This PR marks containerd sandbox/pause image as Pinned image, pinned images are not garbage collected by Kubelet.
Currently it only marks sandbox image as pinned.
fixes: #6352