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

fix: argocd version --client tries to connect server #8341

Merged
merged 10 commits into from
Feb 10, 2022
Merged

fix: argocd version --client tries to connect server #8341

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6c957f0
fixed issue with version --client cmd
gdsoumya Feb 2, 2022
3ee3065
moved local api server creation to NewClientOrDie()
gdsoumya Feb 2, 2022
873ee06
lint fixes
gdsoumya Feb 2, 2022
e36bf7a
revert makefile change
gdsoumya Feb 2, 2022
7d61c55
fixed go imports order
gdsoumya Feb 3, 2022
49b01b5
revert makefile change
gdsoumya Feb 3, 2022
f5a717b
lint fix
gdsoumya Feb 3, 2022
8977ba2
reverted generated file changes
gdsoumya Feb 3, 2022
62937ca
fix: moved headless to cli
gdsoumya Feb 9, 2022
2db0076
refactor: reverted back original NewCLientOrDie
gdsoumya Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/argocd/commands/headless/headless.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ func InitCommand(cmd *cobra.Command, clientOpts *argoapi.ClientOptions, port *in
cmd.Flags().AddFlag(flag)
})
cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
if cmd.Name() == "version" {
clientFlag := cmd.Flag("client")
if clientFlag != nil && clientFlag.Value.String() == "true" {
return nil
}
}
startInProcessAPI := clientOpts.Core
if !startInProcessAPI {
localCfg, err := localconfig.ReadLocalConfig(clientOpts.ConfigPath)
Expand Down