Don't fallback to automatic noopDelete if cluster is set

Signed-off-by: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com>
carvel-dev · May 30, 2023 · a843001 · a843001
1 parent 1297080
commit a843001
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/app/app_deploy.go b/pkg/app/app_deploy.go
@@ -57,10 +57,13 @@ func (a *App) delete(changedFunc func(exec.CmdRunResult)) exec.CmdRunResult {
 
 	var result exec.CmdRunResult
 
+	appResourcesInSameNs := a.app.Status.Deploy != nil && a.app.Status.Deploy.KappDeployStatus != nil &&
+		len(a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces) == 1 &&
+		a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces[0] == a.app.Namespace
+
 	// Use noopDelete if the namespace is terminating and app resources are in same namespace because
 	// the app resources will be automatically deleted including the kapp ServiceAccount
-	noopDelete := a.isNamespaceTerminating() && a.app.Status.Deploy != nil && a.app.Status.Deploy.KappDeployStatus != nil &&
-		len(a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces) == 1
+	noopDelete := a.isNamespaceTerminating() && appResourcesInSameNs && a.app.Spec.Cluster == nil
 
 	if !a.app.Spec.NoopDelete && !noopDelete {
 		for _, dep := range a.app.Spec.Deploy {