move delete pkgi function to management components

Author: ggpaue

addons/pkg/util/addon_util.go

@@ -14,12 +14,9 @@ import (
 	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterapiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-
 	kappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
 	pkgiv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
 	kapppkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
@@ -220,27 +217,6 @@ func GetPackageInstallFromAddonSecret(ctx context.Context,
 	return pkgi, nil
 }
 
-// DeletePackageInstall deletes the PackageInstall CR
-func DeletePackageInstall(ctx context.Context, c client.Client, pkgiName, pkgiNamespace string) error {
-	pkgi := &pkgiv1alpha1.PackageInstall{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      pkgiName,
-			Namespace: pkgiNamespace,
-		},
-	}
-	pkgi.Spec.NoopDelete = true
-
-	if _, err := controllerutil.CreateOrPatch(ctx, c, pkgi, nil); err != nil {
-		return errors.Errorf("failed to patch PackageInstall resource %s/%s", pkgiNamespace, pkgiName)
-	}
-
-	if err = c.Delete(ctx, pkgi); err != nil {
-		return errors.Errorf("failed to delete PackageInstall resource %s/%s", pkgiNamespace, pkgiName)
-	}
-
-	return nil
-}
-
 // IsAppPresent returns true if app is present on the cluster
 func IsAppPresent(ctx context.Context,
 	localClient client.Client,

pkg/v1/tkg/managementcomponents/management_component_install.go

@@ -5,13 +5,15 @@ package managementcomponents
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"time"
 
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
+	"k8s.io/apimachinery/pkg/types"
 	crtclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	kappipkg "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
@@ -196,3 +198,30 @@ func WaitForManagementPackages(clusterClient clusterclient.Client, packageInstal
 	}
 	return nil
 }
+
+// DeletePackageInstall deletes the PackageInstall CR
+func noopDeletePackageInstall(ctx context.Context, clusterClient clusterclient.Client, pkgClient tkgpackageclient.TKGPackageClient, pkgiName, pkgiNamespace string) error {
+	pkgi := &kappipkg.PackageInstall{}
+	err := clusterClient.GetResource(pkgi, pkgiName, pkgiNamespace, nil, nil)
+	if err != nil {
+		return errors.Wrapf(err, "unable to get PackageInstall resource %s", pkgiName)
+	}
+
+	patchPkgiSpec := fmt.Sprintf("{\"spec\":{ \"noopDelete\": %t}}", true)
+	err = clusterClient.PatchResource(pkgi, pkgiName, pkgiNamespace, patchPkgiSpec, types.MergePatchType, nil)
+	if err != nil {
+		return errors.Wrapf(err, "failed to patch PackageInstall resource %s", pkgiName)
+	}
+
+	packageInstalledOp := &tkgpackagedatamodel.PackageOptions{
+		PkgInstallName: pkgiName,
+		Namespace:      pkgiNamespace,
+	}
+	err = pkgClient.UninstallPackageSync(packageInstalledOp)
+	//err = clusterClient.DeleteResource(pkgi)
+	if err != nil {
+		return errors.Wrapf(err, "failed to delete PackageInstall resource %s", pkgiName)
+	}
+
+	return nil
+}