fix: recreate application in managed mode upon deletion from spoke #605
Conversation
Rizwana777
requested review from
chetan-rns,
jannfis and
jgwest
as code owners
Rizwana777
changed the title
Rizwana777
changed the title
Rizwana777
changed the title
Rizwana777
force-pushed
the
issue-7836-bug
branch
2 times, most recently
from
2c71774 to
0c49341
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #605 +/- ##
==========================================
+ Coverage 45.41% 45.48% +0.07%
==========================================
Files 90 90
Lines 9907 9915 +8
==========================================
+ Hits 4499 4510 +11
+ Misses 4949 4944 -5
- Partials 459 461 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
@Rizwana777 Can you please pull the latest updates from main? Hopefully, that should fix the e2e tests. |
principal/event.go
Outdated
| // In managed mode, if the application was deleted from the agent but the principal | ||
| // application is not in deletion state, we should recreate it by sending the | ||
| // application spec back to the managed agent | ||
| logCtx.Info("Recreating application in managed agent to maintain desired state") |
There was a problem hiding this comment.
We maintain a cache of the desired state app spec on the agent. Can we use that to revert the deletion?
Ref: #567
Also, some of these methods are being refactored to avoid duplication here #596
There was a problem hiding this comment.
I will update this logic
There was a problem hiding this comment.
@Rizwana777 #596 has been merged
There was a problem hiding this comment.
Thanks @chetan-rns I will modify my PR accordingly
Rizwana777
force-pushed
the
issue-7836-bug
branch
from
3cde9b8 to
2857853
Compare
Rizwana777
force-pushed
the
issue-7836-bug
branch
from
2857853 to
d570ada
Compare
Rizwana777
changed the title
Rizwana777
changed the title
Rizwana777
force-pushed
the
issue-7836-bug
branch
from
7a1ad7a to
e909e73
Compare
Rizwana777
changed the title
Assisted-by: Cursor Signed-off-by: Rizwana777 <[email protected]>
Assisted-by: Cursor Signed-off-by: Rizwana777 <[email protected]>
Rizwana777
force-pushed
the
issue-7836-bug
branch
from
e909e73 to
59188ab
Compare
|
|
||
| t.Log("Verify application is deleted from managed agent") | ||
| requires.Eventually(func() bool { | ||
| app := argoapp.Application{} |
There was a problem hiding this comment.
This check may not always pass. What if the app gets recreated before we reach this check?
| // 1. A managed application exists on both principal and managed agent | ||
| // 2. The application is directly deleted from the managed agent (while agent is running) | ||
| // 3. The agent should detect this unauthorized deletion and recreate the application automatically | ||
| func (suite *ResyncTestSuite) Test_ManagedAppRecreationOnDirectDeletion() { |
There was a problem hiding this comment.
Can we move this test to appcache_test.go? We have all the revert-based tests in that file. For example, here's a similar test for the autonomous agent https://github.com/argoproj-labs/argocd-agent/blob/main/test/e2e/appcache_test.go#L235
3 participants
What does this PR do / why we need it:
Application was not recreating when deleted from managed mode even though Principal is not in deletion state, In this fix application is recreating immediately once it is deleted from managed mode
Which issue(s) this PR fixes:
Fixes #?
https://issues.redhat.com/browse/GITOPS-7836
How to test changes / Special notes to the reviewer:
Checklist