Skip to content

Cascade deletion is decided during app deletion, instead of app creation (resolves #301) #361

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.

Sign up for GitHub

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

Merged
jessesuen merged 1 commit into from
Jul 10, 2018
Merged

Cascade deletion is decided during app deletion, instead of app creation (resolves #301) #361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions server/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ func (s *Server) Create(ctx context.Context, q *ApplicationCreateRequest) (*appv
if err != nil {
return nil, err
}
a.SetCascadedDeletion(true)
out, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Create(&a)
if apierr.IsAlreadyExists(err) {
// act idempotent if existing spec matches new spec
Expand Down Expand Up @@ -336,8 +335,23 @@ func (s *Server) Delete(ctx context.Context, q *ApplicationDeleteRequest) (*Appl
return nil, grpc.ErrPermissionDenied
}

if q.Cascade != nil && *q.Cascade != a.CascadedDeletion() {
a.SetCascadedDeletion(*q.Cascade)
patchFinalizer := false
if q.Cascade == nil || *q.Cascade {
if !a.CascadedDeletion() {
a.SetCascadedDeletion(true)
patchFinalizer = true
}
} else {
if a.CascadedDeletion() {
a.SetCascadedDeletion(false)
patchFinalizer = true
}
}

if patchFinalizer {
// Prior to v0.6, the cascaded deletion finalizer was set during app creation.
// For backward compatibility, we always calculate the patch to see if we need to
// set/unset the finalizer (in case we are dealing with an app created prior to v0.6)
patch, err := json.Marshal(map[string]interface{}{
"metadata": map[string]interface{}{
"finalizers": a.Finalizers,
Expand Down