feat: Add possibility to specify write-back GIT repository as annotation #424

flozzone · 2022-04-22T12:33:44Z

Addressing #423

This PR does the following:

Get the repository URL either from app.Spec.Source.RepoURL or from argocd-image-updater.argoproj.io/git-repository if specified and store it into the WriteBackConfig struct as GitRepo.
Write a test to show git-repository annotation functionality
Update relevant documentation
Fix GitHub workflow linting tests by upgrading golangci-lint to its latest version

CLAassistant · 2022-04-22T12:33:48Z

All committers have signed the CLA.

flozzone · 2022-04-22T12:46:37Z

Do we need to update something in order to pass linting tests? #413 #410 seem to have a similar problem.

flozzone · 2022-04-22T13:05:25Z

Do we need to update something in order to pass linting tests? #413 #410 seem to have a similar problem.

Updating to latest version v1.45.2 for the golangci/golangci-lint-action@v2 action fixed linting tests.

nikodemjedynak-dnv · 2022-12-20T10:21:22Z

@flozzone Any updates on this resolution to the issue? Is it going to be merged? Anyone fancies a review?

joshbrgs

I think this is solid work, the only merge conflict is the ci-tests golangci-lint-action version. I tested it locally and the tests still pass. I would approve but not sure what the rules around that look like (if a more frequent contributer is required to approve). @flozzone @chathumal-nad

.github/workflows/ci-tests.yaml

codecov-commenter · 2023-05-13T18:31:38Z

Codecov Report

Merging #424 (79d7ab9) into master (49825ec) will increase coverage by 0.06%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master     #424      +/-   ##
==========================================
+ Coverage   65.76%   65.83%   +0.06%     
==========================================
  Files          21       21              
  Lines        2039     2043       +4     
==========================================
+ Hits         1341     1345       +4     
  Misses        569      569              
  Partials      129      129

Impacted Files	Coverage Δ
pkg/argocd/git.go	`64.84% <0.00%> (ø)`
pkg/argocd/gitcreds.go	`76.19% <83.33%> (ø)`
pkg/argocd/update.go	`70.28% <83.33%> (+0.48%)`	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Signed-off-by: flozzone <flozzone@gmail.com>

flozzone · 2023-05-13T19:06:00Z

To fix golangci-lint issues I needed to:

Update golangci-lint to 1.52.2

Replace deprecated linters, deadcode, ,varcheck, structcheck by the newer unused linter. See relevant golangci-lint PR at Deprecate varcheck, structcheck, and deadcode golangci/golangci-lint#1841
Run goimports -w -local github.com/argoproj-labs/argocd-image-updater . to fix
- comment indentation
- order of imports

bn-cforkner · 2023-06-09T22:21:07Z

@jannfis bump for this. I know you're probably super busy, but thanks for taking a look

jannfis · 2023-06-10T19:24:27Z

Thanks for bumping this @bn-cforkner , I'm currently going through the backlog of PRs and issues. I'm really sorry to have been undercover for a while.

Couple of the changes in this PR have been merged recently (i.e. lint update), @flozzone could you please rebase this PR to what's in master? Thanks!

rwc · 2023-07-21T09:30:54Z

@jannfis @flozzone Hoping to get another look before this gets anymore stale. Would definitely provide some useful function we’re excited to get our hands on.

jannfis

LGTM! Thank you, and sorry for the delay.

…ion (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Jarvis Yang <jarvis.yang@recurohealth.com>

…ion (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>

Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> docs: Fixed typo (argoproj-labs#589) Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Add possibility to specify write-back GIT repository as annotation (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: support ocischema.DeserializedImageIndex in registry client Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix test Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> refactor: use shared function to reduce duplication Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> Fix after rebase Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Fix spell checking config (argoproj-labs#577) Signed-off-by: satoru <satorulogic@gmail.com> docs: Fixed typo (argoproj-labs#589) chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com>

LS80 · 2023-09-06T07:41:40Z

@flozzone I'm interested in the use case for this. As far as I can tell, the override files would not be used by Argo CD when rendering the manifests so why write the files to a separate git repository?

joshbrgs · 2023-09-06T11:26:46Z

@flozzone I'm interested in the use case for this. As far as I can tell, the override files would not be used by Argo CD when rendering the manifests so why write the files to a separate git repository?

@LS80 I know a use case it could be handy for is when you want git write back method and are using an OCI storage for your charts.

LS80 · 2023-09-06T11:48:38Z

@LS80 I know a use case it could be handy for is when you want git write back method and are using an OCI storage for your charts.

Yes but I'm not sure what use the git write back method has if the override files created/updated in git will not actually be used by Argo CD. If an Argo CD application could be configured to use override files from a repo other than the one specified as source.repoURL then it would be really useful. I've just remembered that we can now have multiple sources so maybe that would work. One repoURL for the parameter override files in git and another referencing the helm repo...

rwc · 2023-09-07T04:30:39Z

@LS80 We use it as a record of deployment in environments where the origin of what’s running must be certified/tracked for compliance reasons.

…ion (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Francesc Arbona <francesc.arbona@global.ntt>

…ion (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com>

flozzone force-pushed the fix-423 branch 2 times, most recently from 6097d45 to 7b5df83 Compare April 22, 2022 12:51

flozzone force-pushed the fix-423 branch 4 times, most recently from 70b79ea to 039ec92 Compare April 25, 2022 07:57

chathumal-nad approved these changes Mar 27, 2023

View reviewed changes

joshbrgs reviewed May 4, 2023

View reviewed changes

.github/workflows/ci-tests.yaml Outdated Show resolved Hide resolved

joshbrgs approved these changes May 10, 2023

View reviewed changes

flozzone force-pushed the fix-423 branch from 039ec92 to ae23439 Compare May 13, 2023 18:19

flozzone added 4 commits May 13, 2023 20:34

Add possibility to specify write-back GIT repository as annotation.

704a101

Signed-off-by: flozzone <flozzone@gmail.com>

Update golangci-lint to 1.52.2.

8e40fd4

Signed-off-by: flozzone <flozzone@gmail.com>

Replace deprecated golangci linters with 'unused' linter.

bac548e

Signed-off-by: flozzone <flozzone@gmail.com>

Fix Goimport issues.

79d7ab9

Signed-off-by: flozzone <flozzone@gmail.com>

flozzone force-pushed the fix-423 branch from 6dd0ce8 to 79d7ab9 Compare May 13, 2023 18:55

jannfis approved these changes Aug 15, 2023

View reviewed changes

jannfis changed the title ~~Add possibility to specify write-back GIT repository as annotation.~~ feat: Add possibility to specify write-back GIT repository as annotation Aug 15, 2023

jannfis merged commit 202f6bf into argoproj-labs:master Aug 15, 2023
10 checks passed

LS80 mentioned this pull request Sep 8, 2023

Multi-source support for .argocd-source-<appName>.yaml argoproj/argo-cd#14672

Open

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add possibility to specify write-back GIT repository as annotation #424

feat: Add possibility to specify write-back GIT repository as annotation #424

flozzone commented Apr 22, 2022 •

edited

Loading

CLAassistant commented Apr 22, 2022 •

edited

Loading

flozzone commented Apr 22, 2022

flozzone commented Apr 22, 2022

nikodemjedynak-dnv commented Dec 20, 2022

joshbrgs left a comment •

edited

Loading

codecov-commenter commented May 13, 2023 •

edited

Loading

flozzone commented May 13, 2023 •

edited

Loading

bn-cforkner commented Jun 9, 2023

jannfis commented Jun 10, 2023

rwc commented Jul 21, 2023

jannfis left a comment

LS80 commented Sep 6, 2023

joshbrgs commented Sep 6, 2023

LS80 commented Sep 6, 2023

rwc commented Sep 7, 2023

feat: Add possibility to specify write-back GIT repository as annotation #424

feat: Add possibility to specify write-back GIT repository as annotation #424

Conversation

flozzone commented Apr 22, 2022 • edited Loading

CLAassistant commented Apr 22, 2022 • edited Loading

flozzone commented Apr 22, 2022

flozzone commented Apr 22, 2022

nikodemjedynak-dnv commented Dec 20, 2022

joshbrgs left a comment • edited Loading

Choose a reason for hiding this comment

codecov-commenter commented May 13, 2023 • edited Loading

Codecov Report

flozzone commented May 13, 2023 • edited Loading

bn-cforkner commented Jun 9, 2023

jannfis commented Jun 10, 2023

rwc commented Jul 21, 2023

jannfis left a comment

Choose a reason for hiding this comment

LS80 commented Sep 6, 2023

joshbrgs commented Sep 6, 2023

LS80 commented Sep 6, 2023

rwc commented Sep 7, 2023

flozzone commented Apr 22, 2022 •

edited

Loading

CLAassistant commented Apr 22, 2022 •

edited

Loading

joshbrgs left a comment •

edited

Loading

codecov-commenter commented May 13, 2023 •

edited

Loading

flozzone commented May 13, 2023 •

edited

Loading