fix: adding commonAnnotations

[igaskin]

optional k/v map to add annotations via kustomize.
#4603

dont mind me, just copy pasting some code...

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).
• 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've signed the CLA and my build is green (troubleshooting builds).

[codecov-io]

Codecov Report

Merging #4613 into master will decrease coverage by 0.05%.
The diff coverage is 76.66%.

@@            Coverage Diff             @@
##           master    #4613      +/-   ##
==========================================
- Coverage   41.10%   41.05%   -0.06%     
==========================================
  Files         127      127              
  Lines       17367    17391      +24     
==========================================
+ Hits         7139     7140       +1     
- Misses       9202     9228      +26     
+ Partials     1026     1023       -3     

Impacted Files	Coverage Δ
cmd/argocd/commands/app.go	6.50% <68.75%> (+0.41%)	⬆️
util/kustomize/kustomize.go	64.28% <83.33%> (+2.00%)	⬆️
pkg/apis/application/v1alpha1/types.go	57.98% <100.00%> (+0.05%)	⬆️
controller/appcontroller.go	50.56% <0.00%> (-1.92%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd856e1...484d9dc. Read the comment docs.

[jannfis]

Thank you @igaskin! Change looks good so far, with two small review comments below.

Also, the CLI has an option for adding/modifying commonLabels, which I feel should be duplicated for commonAnnotations as well (somewhere here:

argo-cd/cmd/argocd/commands/app.go

Line 821 in 5db8d97

command.Flags().StringArrayVar(&opts.kustomizeCommonLabels, "kustomize-common-label", []string{}, "Set common labels in Kustomize")

)

I haven't had a look at the UI yet, does it provide means to add/edit commonLabels? If yes, maybe we should also give it a go for commonAnnotations :)

[igaskin]

Thank you @igaskin! Change looks good so far, with two small review comments below.

Also, the CLI has an option for adding/modifying commonLabels, which I feel should be duplicated for commonAnnotations as well (somewhere here:

argo-cd/cmd/argocd/commands/app.go

Line 821 in 5db8d97

command.Flags().StringArrayVar(&opts.kustomizeCommonLabels, "kustomize-common-label", []string{}, "Set common labels in Kustomize")

)
I haven't had a look at the UI yet, does it provide means to add/edit commonLabels? If yes, maybe we should also give it a go for commonAnnotations :)

It doesn't appear that the UI has a means to add/edit commonLabels, but it probably should. Maybe that should warrant a separate PR?

I ran the kustomize_test.go test locally, and confirmed that annotations were added as expected. There was also a bug in the setKustomizeOpt method that I addressed by adding some nil checks. Prior to this it would only honor the last kustomize option.

[jannfis]

It doesn't appear that the UI has a means to add/edit commonLabels, but it probably should. Maybe that should warrant a separate PR?

Yes agreed, this could be done in a separate PR.

Can you please re-sync your branch with latest master and re-run codegen to resolve conflict in swagger.json?

[jannfis]

Awesome, thank you @igaskin

LGTM