This repository was archived by the owner on Mar 9, 2022. It is now read-only.
Apply sandbox image config #48
Merged
Conversation
This file contains hidden or 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
Member
Author
|
This PR passes sandbox and image CRI validation test: |
Random-Liu
force-pushed
the
apply-sandbox-image-config
branch
from
c6b9ac4 to
aa1ffe4
Compare
mikebrow
reviewed
May 24, 2017
pkg/server/helpers.go
Outdated
| return &uid, "" | ||
| } | ||
|
|
||
| // getImageMetadata returns corresponding metadata of the image reference, if image is not |
Member
There was a problem hiding this comment.
pulling the image makes getting metadata for the image expensive... Is there a use case for getting metadata for images that have not yet been pulled for containers?
Member
Author
There was a problem hiding this comment.
We need to pull image when running pod sandbox.
We may need a better function name here though.
Member
There was a problem hiding this comment.
Sure as long as it's clear that this is a variant of an image pull... and not just a metadata retrieval.. that works!
Member
Author
There was a problem hiding this comment.
Yeah, will update the function name, probably something like ensureImage.
Member
Author
There was a problem hiding this comment.
Done. Updated the function name to ensureImageExists.
This was referenced May 25, 2017
Merged
Random-Liu
force-pushed
the
apply-sandbox-image-config
branch
from
aa1ffe4 to
33f4f14
Compare
Signed-off-by: Lantao Liu <[email protected]>
Random-Liu
force-pushed
the
apply-sandbox-image-config
branch
from
33f4f14 to
4f6840c
Compare
Member
Author
yujuhong
reviewed
May 30, 2017
pkg/server/helpers.go
Outdated
| // ensureImageExists returns corresponding metadata of the image reference, if image is not | ||
| // pulled yet, the function will pull the image when ensure is true, and return error when | ||
| // ensure if false. | ||
| func (c *criContainerdService) ensureImageExists(ctx context.Context, ref string, ensure bool) (*metadata.ImageMetadata, error) { |
Member
There was a problem hiding this comment.
Can we break it up to two functions instead of relying on ensure to toggle the behavior? I think it's generally preferred making the functions more cohesive and easier to reuse.
You could also factor the logic the logic from 361 to 370 to check whether the image exists or not.
pkg/server/helpers.go
Outdated
| if err == nil { | ||
| return meta, nil | ||
| } | ||
| if err != nil && !metadata.IsNotExistError(err) { |
Member
There was a problem hiding this comment.
Nit: no need to check err != nil because if err is nil, the code would've returned in line 368.
Member
Author
|
@yujuhong Updated |
Member
Author
|
Close and reopen to trigger the test. |
Member
|
LGTM |
Signed-off-by: Lantao Liu <[email protected]>
Signed-off-by: Lantao Liu <[email protected]>
Random-Liu
force-pushed
the
apply-sandbox-image-config
branch
from
a087112 to
6eb1ddb
Compare
Member
Author
|
Apply LGTM based on #48 (comment) Will merge after test passed. It seems that travis is overloaded. |
lanchongyizu
pushed a commit
to lanchongyizu/cri-containerd
that referenced
this pull request
Sep 3, 2017
…config Apply sandbox image config
adelina-t
pushed a commit
to adelina-t/cri
that referenced
this pull request
Nov 1, 2019
Remove automange-vhd's on ContainerCreate failure
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Based on #41 and #46.
This PR let sandbox container use pause image and applies image config.
Only the last commit is new. Will rebase the PR and previous PRs soon.