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: support 'helm.sh/resource-policy: keep' helm annotation #13157

Merged
merged 2 commits into from
Apr 24, 2023

Conversation

alexmt
Copy link
Collaborator

@alexmt alexmt commented Apr 7, 2023

The v2.7 introduced argocd.argoproj.io/sync-options: Delete=false that prevents resource deletion. This PR expands the feature and supports helm.sh/resource-policy: keep annotation as well.

Since Argo CD in general is trying to support helm hooks, so it makes sense to support helm.sh/resource-policy: keep as well.

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
@codecov
Copy link

codecov bot commented Apr 7, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.03 ⚠️

Comparison is base (9b53eeb) 49.05% compared to head (a89f628) 49.03%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13157      +/-   ##
==========================================
- Coverage   49.05%   49.03%   -0.03%     
==========================================
  Files         246      247       +1     
  Lines       42569    42694     +125     
==========================================
+ Hits        20882    20933      +51     
- Misses      19572    19645      +73     
- Partials     2115     2116       +1     
Impacted Files Coverage Δ
util/helm/helm.go 44.14% <ø> (ø)
controller/appcontroller.go 53.10% <100.00%> (+0.06%) ⬆️

... and 10 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

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

@jessesuen
Copy link
Member

jessesuen commented Apr 24, 2023

This will need to be listed as a v2.8 (or 2.7 if we intend to include in v2.7 release) breaking change since we now keep resources where we didn't.

@jessesuen jessesuen closed this Apr 24, 2023
@jessesuen jessesuen reopened this Apr 24, 2023
@jessesuen
Copy link
Member

jessesuen commented Apr 24, 2023

Oops, sorry. Clicked "Closed" instead of "Comment"

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
@alexmt
Copy link
Collaborator Author

alexmt commented Apr 24, 2023

Thank you @jessesuen ! Updated upgrade instructions

@alexmt alexmt merged commit 2126bcf into argoproj:master Apr 24, 2023
24 checks passed
@alexmt
Copy link
Collaborator Author

alexmt commented Apr 24, 2023

/cherry-pick release-2.7

alexmt added a commit that referenced this pull request Apr 24, 2023
* feat: support 'helm.sh/resource-policy: keep' helm annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* document  annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

---------

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Jul 24, 2023
…oj#13157)

* feat: support 'helm.sh/resource-policy: keep' helm annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* document  annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

---------

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
…oj#13157)

* feat: support 'helm.sh/resource-policy: keep' helm annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* document  annotation

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

---------

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@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

4 participants