Skip to content
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

fix: Use ARGOCD_SERVER for default value #21930

Merged
merged 1 commit into from
Feb 22, 2025
Merged

fix: Use ARGOCD_SERVER for default value #21930

merged 1 commit into from
Feb 22, 2025
+3 −1

Conversation

sivchari
Copy link
Contributor

close #21910

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 Toolchain Guide
  • 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).

ARGOCD_AUTH_TOKEN is already set for default value of auth-token flag. So I also added ARGOCD_SERVER.

@sivchari sivchari requested a review from a team as a code owner February 21, 2025 07:16
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Feb 21, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@sivchari sivchari force-pushed the set-default-value-argo-server branch from af51e13 to 3288a30 Compare February 21, 2025 07:17
@codecov Codecov
Copy link

codecov bot commented Feb 21, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.72%. Comparing base (7870200) to head (3288a30).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
cmd/argocd/commands/root.go 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #21930      +/-   ##
==========================================
+ Coverage   53.83%   55.72%   +1.88%     
==========================================
  Files         341      341              
  Lines       57004    57004              
==========================================
+ Hits        30689    31766    +1077     
+ Misses      23720    22598    -1122     
- Partials     2595     2640      +45

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

nitishfy
nitishfy reviewed Feb 21, 2025
View reviewed changes
Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

Left a small comment.

cmd/argocd/commands/root.go
@@ -67,7 +67,7 @@ func NewCommand() *cobra.Command {
defaultLocalConfigPath, err := localconfig.DefaultLocalConfigPath()
errors.CheckError(err)
command.PersistentFlags().StringVar(&clientOpts.ConfigPath, "config", config.GetFlag("config", defaultLocalConfigPath), "Path to Argo CD config")
command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", config.GetFlag("server", ""), "Argo CD server address")
command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", config.GetFlag("server", env.StringFromEnv(common.EnvServer, "")), "Argo CD server address")
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", config.GetFlag("server", env.StringFromEnv(common.EnvServer, "")), "Argo CD server address")
command.PersistentFlags().StringVar(&clientOpts.ServerAddr, "server", config.GetFlag("server", env.StringFromEnv(common.EnvServer, "")), "Argo CD server address")

what's the default value of this env?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If ARGOCD_SERVER is set as environment variable, the default value is it. If not, the default value is empty string.

gdsoumya
gdsoumya requested changes Feb 22, 2025
View reviewed changes
Copy link
Member

@gdsoumya gdsoumya left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This PR does not completely fix #21910 ARGOCD_AUTH_TOKEN case is not handled. Is it possible to add the fix for the auth token too?

@sivchari
Copy link
Contributor Author

Hi @gdsoumya
ARGO_AUTH_TOKEN is already supported on this line.

@gdsoumya gdsoumya merged commit 9f81cd4 into argoproj:master Feb 22, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitishfy nitishfy nitishfy left review comments

@gdsoumya gdsoumya gdsoumya approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

argocd cli: argocd config takes precedence over env vars
3 participants
@sivchari @gdsoumya @nitishfy