fix: allow docker dhi helm charts to be used #25835
Open
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
Docker has a set of oci Helm charts used as a part of their Hardened Images offering. The issue with that is that these Helm charts have two content layers. Previously for Helm charts we checked for the prescence of only one content layer (=a layer media type ending with `tar` or `tar+gzip`). The problem with that is that DHI has two content layers, one with the actual Helm content, and another with the SBOM content, failing the check. Now we instead check to see if the image's `config.mediaType` is `application/vnd.cncf.helm.config.v1+json`, if so then only lookup a single layer == `application/vnd.cncf.helm.chart.content.v1.tar+gzip`, ignoring all others. Fixes argoproj#25811. Signed-off-by: Blake Pettersson <[email protected]>
🔴 Preview Environment stopped on BunnyshellSee: Environment Details | Pipeline Logs Available commands (reply to this comment):
|
blakepettersson
added
cherry-pick/3.1
Signed-off-by: Blake Pettersson <[email protected]>
choejwoo
reviewed
Jan 3, 2026
Signed-off-by: Blake Pettersson <[email protected]>
Signed-off-by: Blake Pettersson <[email protected]>
choejwoo
approved these changes
Jan 9, 2026
Member
choejwoo
left a comment
choejwoo
left a comment
There was a problem hiding this comment.
Thanks for addressing my comment, LGTM!
nitishfy
approved these changes
Jan 12, 2026
christianh814
approved these changes
Jan 12, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Docker has a set of OCI Helm charts used as a part of their Hardened Images offering, which doesn't work with our OCI support 😢
Previously for Helm charts we checked for the presence of only one content layer (=a layer media type ending with
tarortar+gzip). The problem with that is that DHI Helm charts have two content layers, one with the actual Helm content, and another with SBOM content, failing the check.Now we instead check to see if the image's
config.mediaTypeisapplication/vnd.cncf.helm.config.v1+json, if so then only lookup a single layer ==application/vnd.cncf.helm.chart.content.v1.tar+gzip, ignoring all others.Fixes #25811.
Checklist: