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.

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

chore: Add additional field to set Extra Build Information while building argo-cd by vendors #13324

Merged
merged 4 commits into from
Apr 27, 2023
Merged

chore: Add additional field to set Extra Build Information while building argo-cd by vendors #13324

merged 4 commits into from
Apr 27, 2023

Conversation

ishitasequeira
Copy link
Member

The PR adds a new field ExtraBuildInfo to the version information. This field allows vendors to pass in additional information while building argo-cd image needed by them.

E.g.:

$ make EXTRA_BUILD_INFO="Built by Ishita" cli-local server controller repo-server 

$ ./dist/argocd-server version
argocd-server: v2.6.0+74ab638.dirty
  BuildDate: 2023-04-23T22:26:30Z
  GitCommit: 74ab6383e53e0f9cf3939473b973b238e74baf82
  GitTreeState: dirty
  GoVersion: go1.20.2
  Compiler: gc
  Platform: darwin/amd64
  ExtraBuildInfo : Built by Ishita

$ ./dist/argocd version --client
argocd: v2.6.0+74ab638.dirty
  BuildDate: 2023-04-23T22:26:14Z
  GitCommit: 74ab6383e53e0f9cf3939473b973b238e74baf82
  GitTreeState: dirty
  GoVersion: go1.20.2
  Compiler: gc
  Platform: darwin/amd64
  ExtraBuildInfo : Built by Ishita

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

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.
  • Optional. My organization is added to USERS.md.
  • 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.

@codecov
Copy link

codecov bot commented Apr 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (daae5ef) 49.02% compared to head (57004b6) 49.01%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13324      +/-   ##
==========================================
- Coverage   49.02%   49.01%   -0.01%     
==========================================
  Files         247      247              
  Lines       42694    42700       +6     
==========================================
  Hits        20930    20930              
- Misses      19647    19653       +6     
  Partials     2117     2117              
Impacted Files Coverage Δ
cmd/argocd/commands/version.go 36.56% <0.00%> (-1.72%) ⬇️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

I have some nits here

cmd/argocd/commands/version.go Outdated Show resolved Hide resolved
cmd/argocd/commands/version.go Outdated Show resolved Hide resolved
cmd/argocd/commands/version.go Outdated Show resolved Hide resolved
cmd/argocd/commands/version.go Outdated Show resolved Hide resolved
util/cli/cli.go Outdated Show resolved Hide resolved
@ishitasequeira ishitasequeira requested a review from jannfis April 24, 2023 03:16
…ocd by vendors

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@jannfis jannfis enabled auto-merge (squash) April 25, 2023 17:51
@jannfis jannfis merged commit 1fe6257 into argoproj:master Apr 27, 2023
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
…ding argo-cd by vendors (argoproj#13324)

* Add additonal field to set Extra Build Information while building argocd by vendors

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Include spaces in extra build info

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
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