Do not include image annotations when building spec #18542
Merged
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
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mheon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@giuseppe @vrothberg @rhatdan PTAL |
Luap99
reviewed
May 11, 2023
|
Fair, will add test after lunch. |
mheon
force-pushed
the
remove_image_annotations
branch
2 times, most recently
from
2fe907e to
01c98d2
Compare
|
Test added |
|
Code LGTM, tests are very red though. |
These annotations can have security implications - crun, for example, allows rootless containers to preserve the user's groups through an annotation. We absolutely should not include annotations from an untrusted image off the internet by default. We may consider whitelisting some annotations (e.g. the legacy WASM annotations), but given that there is now a more explicit way of specifying an image uses the WASM runtime in the OCI image spec, I'm just tearing this out entirely for now. Signed-off-by: Matt Heon <[email protected]>
mheon
force-pushed
the
remove_image_annotations
branch
from
01c98d2 to
2c0f404
Compare
|
Tests should be going green, PTAL |
|
LGTM |
|
/lgtm |
vrothberg
reviewed
May 15, 2023
| inspectData := inspect.InspectContainerToJSON() | ||
| Expect(inspectData).To(HaveLen(1)) | ||
| Expect(inspectData[0].Config.Annotations).To(Not(HaveKey(annoName))) | ||
| Expect(inspectData[0].Config.Annotations).To(Not(HaveKey("testlabel"))) |
There was a problem hiding this comment.
Mini nit: testlabel would still be added to .Config.Labels which we could test here as well
|
/cherry-pick v4.5 |
|
@mheon: new pull request created: #18654 In response to this:
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. |
flouthoc
added a commit
to flouthoc/crun
that referenced
this pull request
Jun 6, 2023
After containers/podman#18542 , podman does not propagates annotations while running the image hence use `--platform wasm/wasi` Signed-off-by: Aditya R <[email protected]>
flouthoc
added a commit
to flouthoc/crun
that referenced
this pull request
Jun 6, 2023
After containers/podman#18542 , podman does not propagates annotations while running the image hence use `--platform wasi/wasm` Signed-off-by: Aditya R <[email protected]>
flouthoc
added a commit
to flouthoc/crun
that referenced
this pull request
Jun 6, 2023
After containers/podman#18542 does not include image annotations when building spec , podman does not propagates annotations while running the image hence use `--platform wasi/wasm`. Signed-off-by: Aditya R <[email protected]>
edsantiago
added a commit
to edsantiago/libpod
that referenced
this pull request
Jun 26, 2023
Add new _prefetch helper for fetching and caching images. Use it in a few places, most importantly 120-load.bats where our teardown() now runs 'rmi -af'. Reason: in containers#17911 we discovered that podman save + load do not actually preserve the image: annotations and other metadata are lost. This means that a test which runs after 120-load.bats is operating on a different $IMAGE than a test which runs before. This is not a problem except in very obscure corner cases, like one fixed in containers#18542, but it seems irresponsible to just handwave that issue away The _prefetch function uses skopeo for fetching and saving images, because skopeo preserves digests and metadata. [Side note for posterity: I tried amending basic_setup() to always rmi -a + prefetch, instead of the current images -a + rmi unwanted ones. That slowed down system tests by 10 minutes, presumably because loads are much slower than queries. I reverted that change and am documenting it as a reminder of why we do things the way we do.] Signed-off-by: Ed Santiago <[email protected]>
github-actions
bot
added
the
locked - please file new issue/PR
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.
These annotations can have security implications - crun, for example, allows rootless containers to preserve the user's groups through an annotation. We absolutely should not include annotations from an untrusted image off the internet by default.
We may consider whitelisting some annotations (e.g. the legacy WASM annotations), but given that there is now a more explicit way of specifying an image uses the WASM runtime in the OCI image spec, I'm just tearing this out entirely for now.