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

Add flag to skip checking resources when fully delete app #594

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/kapp/app/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type App interface {

CreateOrUpdate(map[string]string, bool) error
Exists() (bool, string, error)
Delete() error
Delete(bool) error
Rename(string, string) error
RenamePrevApp(string, map[string]string, bool) error

Expand Down
6 changes: 5 additions & 1 deletion pkg/kapp/app/labeled_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,16 @@ func (a *LabeledApp) UpdateUsedGVsAndGKs([]schema.GroupVersion, []schema.GroupKi
func (a *LabeledApp) CreateOrUpdate(labels map[string]string, isDiffRun bool) error { return nil }
func (a *LabeledApp) Exists() (bool, string, error) { return true, "", nil }

func (a *LabeledApp) Delete() error {
func (a *LabeledApp) Delete(checkResourcesDeleted bool) error {
labelSelector, err := a.LabelSelector()
if err != nil {
return err
}

if !checkResourcesDeleted {
return nil
}

rs, err := a.identifiedResources.List(labelSelector, nil, ctlres.IdentifiedResourcesListOpts{IgnoreCachedResTypes: true})
if err != nil {
return fmt.Errorf("Relisting app resources: %w", err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/kapp/app/recorded_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ func (a *RecordedApp) Exists() (bool, string, error) {
return true, "", nil
}

func (a *RecordedApp) Delete() error {
func (a *RecordedApp) Delete(checkResourcesDeleted bool) error {
app, err := a.labeledApp()
if err != nil {
return err
Expand All @@ -364,7 +364,7 @@ func (a *RecordedApp) Delete() error {
return fmt.Errorf("Deleting app changes: %w", err)
}

err = app.Delete()
err = app.Delete(checkResourcesDeleted)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/kapp/cmd/app/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type DeleteOptions struct {
ApplyFlags ApplyFlags
ResourceTypesFlags ResourceTypesFlags
PrevAppFlags PrevAppFlags
DeleteFlags DeleteFlags
}

type changesSummary struct {
Expand Down Expand Up @@ -56,6 +57,7 @@ func NewDeleteCmd(o *DeleteOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
o.ApplyFlags.SetWithDefaults("", ApplyFlagsDeleteDefaults, cmd)
o.ResourceTypesFlags.Set(cmd)
o.PrevAppFlags.Set(cmd)
o.DeleteFlags.Set(cmd)
return cmd
}

Expand Down Expand Up @@ -157,7 +159,7 @@ func (o *DeleteOptions) Run() error {
return err
}
if shouldFullyDeleteApp {
return app.Delete()
return app.Delete(o.DeleteFlags.DisableCheckingResourceDeletion)
}
return nil
})
Expand Down
15 changes: 15 additions & 0 deletions pkg/kapp/cmd/app/delete_flags.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2022 VMware, Inc.
// SPDX-License-Identifier: Apache-2.0

package app
firgavin marked this conversation as resolved.
Show resolved Hide resolved

import "github.com/spf13/cobra"

type DeleteFlags struct {
DisableCheckingResourceDeletion bool
}

func (s *DeleteFlags) Set(cmd *cobra.Command) {
cmd.Flags().BoolVar(&s.DisableCheckingResourceDeletion, "dangerous-disable-checking-resource-deletion",
false, "Skip checking resource deletion when fully deleting app")
}