feat: oci support (Beta) #18646

blakepettersson · 2024-06-13T23:04:01Z

This is a WIP for OCI support in Argo CD. This is the implementation PR for the proposal in #17564.

Checklist:

util/oci/client.go

ishitasequeira

@blakepettersson , The overall code on the PR looks good so far. This is an amazing start to the feature. I have not tested stuff yet though.

One thing we might need to look into is how can we reduce the number of calls to OCI repositories like adding some caching for resolve revision and extract calls. Something what we already do for git ls-remote calls. But this can be a future enhancement.

util/oci/client.go

reposerver/repository/repository.go

pkg/apis/application/v1alpha1/repository_types.go

util/oci/client.go

codecov · 2024-09-07T01:42:34Z

Codecov Report

Attention: Patch coverage is 52.08071% with 380 lines in your changes missing coverage. Please review.

Project coverage is 59.88%. Comparing base (9472273) to head (14d0b46).
Report is 64 commits behind head on master.

Files with missing lines	Patch %	Lines
util/oci/client.go	56.85%	118 Missing and 33 partials ⚠️
reposerver/repository/repository.go	45.71%	67 Missing and 9 partials ⚠️
server/application/application.go	27.58%	37 Missing and 5 partials ⚠️
util/argo/argo.go	45.00%	16 Missing and 6 partials ⚠️
server/repository/repository.go	5.55%	17 Missing ⚠️
util/db/repository_secrets.go	48.27%	11 Missing and 4 partials ⚠️
reposerver/cache/cache.go	0.00%	13 Missing ⚠️
controller/state.go	58.62%	8 Missing and 4 partials ⚠️
cmd/argocd/commands/admin/repo.go	0.00%	10 Missing ⚠️
util/io/files/tar.go	55.55%	7 Missing and 1 partial ⚠️
... and 3 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #18646      +/-   ##
==========================================
- Coverage   60.00%   59.88%   -0.12%     
==========================================
  Files         341      342       +1     
  Lines       57818    58539     +721     
==========================================
+ Hits        34694    35058     +364     
- Misses      20344    20632     +288     
- Partials     2780     2849      +69

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

ui/src/app/applications/components/application-status-panel/revision-metadata-panel.tsx

ui/src/app/settings/components/repos-list/repos-list.tsx

ui/src/app/applications/components/utils.tsx

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

This is to align with what's been done in argoproj#22712. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Use the same impl Helm does. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

devantler · 2025-05-21T13:47:51Z

Hey @blakepettersson, I have been following the progress here with great interest. Really awesome work! It seems the solution is mostly polish at this point. Can you share anything on the expected timeline for this PR? Is it a reasonable expectation that we will see OCI support in ArgoCD within months, or is this still far off?

blakepettersson · 2025-05-21T15:30:05Z

Hey @devantler!

This is indeed (more or less) done, most of the updates I've been doing is to resolve any conflicts with master. The expectation is that this will land for 3.1, pending a review from some of the maintainers.

Seems like ORAS has changed the error messaging slightly. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

blakepettersson · 2025-06-06T11:27:46Z

This has been MERGED 🎉 🎉 🎉

There are still a few follow-up PRs that needs to be done, but the big bulk of this has been done 🚀

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: enneitex <etienne.divet@gmail.com>

blakepettersson requested review from a team as code owners June 13, 2024 23:04

christianh814 approved these changes Jun 15, 2024

View reviewed changes

blakepettersson mentioned this pull request Jun 16, 2024

Support OCI manifests akuity/kargo#1099

Open

1 task

christianh814 approved these changes Jun 18, 2024

View reviewed changes

Wwwsylvia reviewed Jun 24, 2024

View reviewed changes

util/oci/client.go Show resolved Hide resolved

ishitasequeira reviewed Jun 24, 2024

View reviewed changes

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

blakepettersson commented Jun 26, 2024

View reviewed changes

reposerver/repository/repository.go Outdated Show resolved Hide resolved

blakepettersson force-pushed the feature/oci branch from 00a0e52 to 53011c3 Compare July 8, 2024 19:48

shizhMSFT reviewed Aug 7, 2024

View reviewed changes

pkg/apis/application/v1alpha1/repository_types.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

blakepettersson changed the base branch from oci-integration to master August 22, 2024 11:18

blakepettersson force-pushed the feature/oci branch from 53011c3 to c682005 Compare August 22, 2024 11:35

christianh814 approved these changes Aug 23, 2024

View reviewed changes

Wwwsylvia reviewed Aug 26, 2024

View reviewed changes

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

util/oci/client.go Outdated Show resolved Hide resolved

blakepettersson force-pushed the feature/oci branch from 72b5568 to 06c9b58 Compare September 6, 2024 21:29

blakepettersson changed the title ~~feat: super duper wip oci support~~ feat: oci support (wip) Sep 9, 2024

agaudreault marked this pull request as draft September 10, 2024 16:39

blakepettersson force-pushed the feature/oci branch from 48bf124 to b4a2d27 Compare September 10, 2024 21:27

keithchong reviewed Sep 17, 2024

View reviewed changes

ui/src/app/applications/components/application-status-panel/revision-metadata-panel.tsx Outdated Show resolved Hide resolved

keithchong reviewed Sep 17, 2024

View reviewed changes

ui/src/app/settings/components/repos-list/repos-list.tsx Outdated Show resolved Hide resolved

keithchong reviewed Sep 17, 2024

View reviewed changes

ui/src/app/applications/components/utils.tsx Show resolved Hide resolved

blakepettersson changed the title ~~feat: oci support (wip)~~ feat: oci support Sep 19, 2024

christianh814 approved these changes Sep 20, 2024

View reviewed changes

blakepettersson force-pushed the feature/oci branch 2 times, most recently from a439909 to 2e7848c Compare October 2, 2024 20:54

blakepettersson changed the title ~~feat: oci support~~ feat: oci support (Beta) Oct 3, 2024

blakepettersson force-pushed the feature/oci branch from 7243332 to d2963a5 Compare October 6, 2024 12:08

blakepettersson force-pushed the feature/oci branch from 1409f54 to 2abf6db Compare October 27, 2024 11:03

blakepettersson added 3 commits May 1, 2025 16:49

fix(test): add oci registry to use

566eb93

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

chore: remove project from cache key

0047770

This is to align with what's been done in argoproj#22712. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

fix: a better way to check for valid creds

cae3aad

Use the same impl Helm does. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

blakepettersson force-pushed the feature/oci branch from f567ba2 to cae3aad Compare May 2, 2025 21:57

blakepettersson added 4 commits May 8, 2025 09:27

Merge branch 'master' into feature/oci

c85b8cf

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

chore: use versions package

6c57cbd

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Merge branch 'master' into feature/oci

5438c44

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Merge branch 'master' into feature/oci

bb4f5ac

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

blakepettersson added 4 commits May 21, 2025 17:46

chore(test): update expected errors

5453079

Seems like ORAS has changed the error messaging slightly. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Merge branch 'master' into feature/oci

22dd83b

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

chore: please linter

6a02754

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

chore: please linter

50eac54

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

crenshaw-dev added this to the v3.1 milestone May 28, 2025

blakepettersson added 4 commits June 5, 2025 18:12

Merge branch 'master' into feature/oci

205dea2

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

refactor: change oci layer media types to be comma-separated

bf70fb0

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

Merge branch 'master' into feature/oci

69b1825

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

chore: lint

14d0b46

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

blakepettersson merged commit 18c4d9d into argoproj:master Jun 6, 2025
42 of 43 checks passed

agaudreault added for-release-blog-3-1 labels Jun 16, 2025

blakepettersson deleted the feature/oci branch July 14, 2025 17:59

hanikesn mentioned this pull request Aug 7, 2025

Support for OCI artifacts bazel-contrib/rules_oci#282

Open

blakepettersson mentioned this pull request Aug 14, 2025

chore: add oci env vars to manifests #24113

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: oci support (Beta) #18646

feat: oci support (Beta) #18646

Uh oh!

blakepettersson commented Jun 13, 2024 •

edited

Loading

Uh oh!

Uh oh!

ishitasequeira left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Sep 7, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

devantler commented May 21, 2025 •

edited

Loading

Uh oh!

blakepettersson commented May 21, 2025

Uh oh!

Uh oh!

blakepettersson commented Jun 6, 2025

Uh oh!

Uh oh!

feat: oci support (Beta) #18646

feat: oci support (Beta) #18646

Uh oh!

Conversation

blakepettersson commented Jun 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ishitasequeira left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Sep 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

devantler commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blakepettersson commented May 21, 2025

Uh oh!

Uh oh!

blakepettersson commented Jun 6, 2025

Uh oh!

Uh oh!

blakepettersson commented Jun 13, 2024 •

edited

Loading

codecov bot commented Sep 7, 2024 •

edited

Loading

devantler commented May 21, 2025 •

edited

Loading