This repository was archived by the owner on Feb 24, 2020. It is now read-only.
stage1/init: fix docker volume semantics #2409
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
If there was an implicit empty volume and the image was converted from docker, we copy the files from the image to the volume. However, if the image defines the mountpoint but the directory is not actually present in the image, CopyTree will do nothing and the volume directory won't be created, making the following Chown call fail. We now create the directory always. If CopyTree already created it, it doesn't hurt.
…test We were only testing the last generated image, and the other cases worked because there was no volume being mounted there and hence the files were visible. Name each test image differently so we actually do the tests.
To detect if we're running an image that was converted from docker, we were getting annotations from the RuntimeApp. This doesn't work for the case where the user runs rkt directly with a pod manifest, since they can omit the annotations there. Instead, use the ImageManifest, which is the right place to look for annotations.
|
LGTM |
|
cc @euank for another pair of eyes. |
|
LGTM too |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
To detect if we're running an image that was converted from docker, we
were getting annotations from the RuntimeApp. This doesn't work for the
case where the user runs rkt directly with a pod manifest, since they
can omit the annotations there.
Instead, use the ImageManifest, which is the right place to look for
annotations.
Also, fix a bug in the tests introduced by #2394 and another bug when the image is converted from docker, has a mountpoint, but the mountpoint directory is not actually included in the image.