Skip to content

chore: add oci env vars to manifests #24113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Aug 14, 2025
Merged

chore: add oci env vars to manifests #24113

merged 3 commits into from
Aug 14, 2025

Conversation

blakepettersson
Copy link
Member

Add the ability to set repo-server oci env vars from the argocd-cmd-params-cm configmap.

Should be backported to 3.1.

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

@blakepettersson
chore: add oci env vars to manifests
a126c84 
Add the ability to set repo-server oci env vars from the
`argocd-cmd-params-cm` configmap.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
@blakepettersson blakepettersson requested a review from a team as a code owner August 12, 2025 07:22
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Aug 12, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@blakepettersson
chore: need to run make manifests-local as well
b58aa0d 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
@codecov Codecov
Copy link

codecov bot commented Aug 12, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 60.24%. Comparing base (45a7a18) to head (b58aa0d).
⚠️ Report is 3 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #24113      +/-   ##
==========================================
- Coverage   60.29%   60.24%   -0.05%     
==========================================
  Files         347      347              
  Lines       59597    59619      +22     
==========================================
- Hits        35934    35918      -16     
- Misses      20797    20823      +26     
- Partials     2866     2878      +12

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

ranakan19
ranakan19 reviewed Aug 13, 2025
View reviewed changes
Copy link
Member

@ranakan19 ranakan19 left a comment

Choose a reason for hiding this comment

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

This successfully adds the environment variable from the configmap to the manifests. I'm curious, will the logic for parsing that value be handled in a separate PR, or am I missing something in the current changes?

@blakepettersson
Copy link
Member Author

Hi @ranakan19,

These OCI env vars are already in use and have been present on the repo-server since the initial merge of the OCI feature (see #18646). You can see them referenced here.

crenshaw-dev
crenshaw-dev reviewed Aug 14, 2025
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Should these also be added to the example cm in docs/operator-manual?

@blakepettersson
docs: add default values of oci env vars to example argocd-cmd-params-cm
ce441da 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
@blakepettersson blakepettersson requested a review from a team as a code owner August 14, 2025 09:47
@blakepettersson
Copy link
Member Author

@crenshaw-dev done!

@crenshaw-dev crenshaw-dev enabled auto-merge (squash) August 14, 2025 09:49
@crenshaw-dev crenshaw-dev merged commit b2b6d98 into argoproj:master Aug 14, 2025
27 checks passed
@codecov Codecov
Copy link

codecov bot commented Aug 14, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 60.10%. Comparing base (45a7a18) to head (ce441da).
⚠️ Report is 16 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #24113      +/-   ##
==========================================
- Coverage   60.29%   60.10%   -0.20%     
==========================================
  Files         347      347              
  Lines       59597    59857     +260     
==========================================
+ Hits        35934    35977      +43     
- Misses      20797    20987     +190     
- Partials     2866     2893      +27

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

blakepettersson added a commit to blakepettersson/argo-cd that referenced this pull request Aug 14, 2025
@blakepettersson
chore: add oci env vars to manifests (argoproj#24113)
7d25625 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
blakepettersson added a commit that referenced this pull request Aug 14, 2025
@blakepettersson
chore: add oci env vars to manifests (#24113) (cherry-pick 3.1) (#24153)
a0f0653 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
@blakepettersson @enneitex
chore: add oci env vars to manifests (argoproj#24113)
e76cd88 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: enneitex <etienne.divet@gmail.com>
downfa11 pushed a commit to downfa11/argo-cd that referenced this pull request Aug 25, 2025
@blakepettersson @downfa11
chore: add oci env vars to manifests (argoproj#24113)
54709a1 
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev approved these changes

@nitishfy nitishfy nitishfy approved these changes

+1 more reviewer

@ranakan19 ranakan19 ranakan19 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@blakepettersson @crenshaw-dev @ranakan19 @nitishfy