Skip to content

fix: Port #18133 to support Docker config for oras client#25614

Closed
frekw wants to merge 1 commit intoargoproj:masterfrom
frekw:fix/oras-docker-config-fallback
Closed

fix: Port #18133 to support Docker config for oras client#25614
frekw wants to merge 1 commit intoargoproj:masterfrom
frekw:fix/oras-docker-config-fallback

Conversation

@frekw
Copy link
Copy Markdown

@frekw frekw commented Dec 10, 2025

This backports the fix in #18133 to fallback to the local Docker config (~/.docker/config.json) in the absence of other credentials.

This should make private OCI repositories like Google's Artifact Registry work via Docker credential helpers like docker-credential-gcr, allowing authentication to seamlessly happen via workload identity.

I believe this is small enough not to need an enhancement proposal, but will happily create one if you disagree!

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).

@frekw frekw requested a review from a team as a code owner December 10, 2025 22:11
@bunnyshell
Copy link
Copy Markdown

bunnyshell bot commented Dec 10, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

This backports the fix in argoproj#18133 to fallback to the local Docker config
(~/.docker/config.json) in the absence of other credentials.

This should make private OCI repositories like Google's Artifact
Registry work via Docker credential helpers like `docker-credential-gcr`,
allowing authentication to seamlessly happen via workload identity.

Signed-off-by: frekw <fredrik@warnsberg.se>
@frekw frekw force-pushed the fix/oras-docker-config-fallback branch from 36e5511 to d5e70c3 Compare December 10, 2025 22:13
@frekw frekw changed the title Port #18133 to support Docker config for oras client fix: Port #18133 to support Docker config for oras client Dec 10, 2025
@codecov
Copy link
Copy Markdown

codecov bot commented Dec 11, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 62.60%. Comparing base (414a178) to head (d5e70c3).
⚠️ Report is 502 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #25614      +/-   ##
==========================================
+ Coverage   62.59%   62.60%   +0.01%     
==========================================
  Files         353      353              
  Lines       49871    49876       +5     
==========================================
+ Hits        31216    31225       +9     
+ Misses      15669    15667       -2     
+ Partials     2986     2984       -2     

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

Copy link
Copy Markdown
Member

@blakepettersson blakepettersson left a comment

Choose a reason for hiding this comment

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

This PR seems to be the exact same one (to the point that there is no diff) of #25565

@frekw
Copy link
Copy Markdown
Author

frekw commented Dec 11, 2025

You’re absolutely right, I was unaware of it. Just spent a couple of hours tearing my hair until realizing what the problem was.

I’ll close this in favor of #25565

@frekw frekw closed this Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants