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

feat: add --app-hard-resync flag to controller #8928

Merged
merged 20 commits into from
Apr 4, 2022

Conversation

pasha-codefresh
Copy link
Member

This is PR for delivery #4678

Thank you @darshanime for you contribution

darshanime and others added 19 commits October 27, 2020 21:20
Signed-off-by: darshanime <deathbullet@gmail.com>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>

# Conflicts:
#	OWNERS
…-refresh

Signed-off-by: pashavictorovich <pavel@codefresh.io>

# Conflicts:
#	cmd/argocd-application-controller/main.go
#	controller/appcontroller.go
…-refresh

Signed-off-by: pashavictorovich <pavel@codefresh.io>

# Conflicts:
#	cmd/argocd-application-controller/main.go
#	controller/appcontroller.go
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
@codecov
Copy link

codecov bot commented Mar 31, 2022

Codecov Report

Merging #8928 (f29fbc0) into master (ad3c315) will increase coverage by 1.55%.
The diff coverage is 84.61%.

@@            Coverage Diff             @@
##           master    #8928      +/-   ##
==========================================
+ Coverage   43.40%   44.95%   +1.55%     
==========================================
  Files         186      212      +26     
  Lines       23373    25272    +1899     
==========================================
+ Hits        10145    11361    +1216     
- Misses      11779    12307     +528     
- Partials     1449     1604     +155     
Impacted Files Coverage Δ
controller/appcontroller.go 52.27% <84.61%> (+0.66%) ⬆️
cmd/argocd/commands/app.go 9.16% <0.00%> (-0.01%) ⬇️
util/settings/settings.go 48.10% <0.00%> (ø)
applicationset/utils/clusterUtils.go 67.85% <0.00%> (ø)
applicationset/controllers/clustereventhandler.go 69.56% <0.00%> (ø)
...cationset/controllers/applicationset_controller.go 56.75% <0.00%> (ø)
applicationset/utils/webhook.go 70.27% <0.00%> (ø)
applicationset/services/scm_provider/utils.go 88.50% <0.00%> (ø)
applicationset/generators/cluster.go 76.56% <0.00%> (ø)
applicationset/utils/policy.go 0.00% <0.00%> (ø)
... and 22 more

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 ad3c315...f29fbc0. Read the comment docs.

Signed-off-by: pashavictorovich <pavel@codefresh.io>
Copy link
Collaborator

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

lgtm!

@crenshaw-dev crenshaw-dev merged commit f11da56 into argoproj:master Apr 4, 2022
wojtekidd pushed a commit to wojtekidd/argo-cd that referenced this pull request Apr 25, 2022
* feat: add --app-hard-resync flag to controller

Signed-off-by: darshanime <deathbullet@gmail.com>

* add to approvers

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* Merge branch 'master' of github.com:pasha-codefresh/argo-cd into hard-refresh

Signed-off-by: pashavictorovich <pavel@codefresh.io>

# Conflicts:
#	cmd/argocd-application-controller/main.go
#	controller/appcontroller.go

* merge

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* merge

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* regenerate docs

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* regenerate docs

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* fix tests

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* read variable from cm

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* reconciliation variable

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* manifest

Signed-off-by: pashavictorovich <pavel@codefresh.io>

Co-authored-by: darshanime <deathbullet@gmail.com>
Signed-off-by: wojtekidd <wojtek.cichon@protonmail.com>
jmeridth added a commit to jmeridth/argo-helm that referenced this pull request Aug 26, 2022
Base on this PR upstream argoproj/argo-cd#8928 we can
now provide a hard resync value to the ArgoCD Application Controller

Signed-off-by: JM <jmeridth@gmail.com>
jmeridth added a commit to argoproj/argo-helm that referenced this pull request Aug 26, 2022
Base on this PR upstream argoproj/argo-cd#8928 we can
now provide a hard resync value to the ArgoCD Application Controller

Signed-off-by: JM <jmeridth@gmail.com>

Signed-off-by: JM <jmeridth@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.

None yet

3 participants