Skip to content

Conversation

@blakepettersson
Copy link
Member

@blakepettersson blakepettersson commented Sep 18, 2025

Fixes #24564. We only allow for a single OCI content layer (or rather a single layer containing manifests), but there are images that contain multiple layers, notably anything that uses attestation/provenance. For example Helm has an application/vnd.cncf.helm.chart.provenance.v1.prov layer if a chart has been signed.

Pending a better story where we would verify these images natively, for now let's skip those layers and only take actual content layers into account.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Fixes argoproj#24564. We only allow for a single OCI _content_ layer (or rather
a single layer containing manifests), but there are images that contain
multiple layers, notably anything that uses attestation/provenance. For
example Helm has a application/vnd.cncf.helm.chart.provenance.v1.prov
layer if a chart has been signed.

Pending a better story where we would verify these images natively, for
now let's skip those layers and only take actual content layers into
account.

Signed-off-by: Blake Pettersson <[email protected]>
@blakepettersson blakepettersson requested a review from a team as a code owner September 18, 2025 12:59
@bunnyshell
Copy link

bunnyshell bot commented Sep 18, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@blakepettersson blakepettersson added cherry-pick/3.1 Candidate for cherry picking into the 3.1 release branch cherry-pick/3.2 Candidate for cherry picking into the 3.2 release branch labels Sep 18, 2025
@codecov
Copy link

codecov bot commented Sep 18, 2025

Codecov Report

❌ Patch coverage is 88.88889% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 60.46%. Comparing base (f4c4c66) to head (458d48e).
⚠️ Report is 39 commits behind head on master.

Files with missing lines Patch % Lines
util/oci/client.go 88.88% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #24640      +/-   ##
==========================================
- Coverage   60.46%   60.46%   -0.01%     
==========================================
  Files         350      350              
  Lines       60105    60187      +82     
==========================================
+ Hits        36345    36391      +46     
- Misses      20828    20848      +20     
- Partials     2932     2948      +16     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@alexmt alexmt merged commit ed983d8 into argoproj:master Sep 18, 2025
37 of 43 checks passed
@blakepettersson blakepettersson deleted the fix/allow-for-extra-oci-layers branch September 18, 2025 15:20
argo-cd-cherry-pick-bot bot pushed a commit that referenced this pull request Sep 18, 2025
@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.2: #24648

@argo-cd-cherry-pick-bot
Copy link

🍒 Cherry-pick PR created for 3.1: #24649

blakepettersson added a commit that referenced this pull request Sep 18, 2025
blakepettersson added a commit that referenced this pull request Sep 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick/3.1 Candidate for cherry picking into the 3.1 release branch cherry-pick/3.2 Candidate for cherry picking into the 3.2 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Additional (provenance) layers in OCI Helm chart blocks deployment

3 participants