Merge branch 'topic/gguanpeng/delete-pkgi' into control_package_lifecycle

Refactored some of the code

Author: Adolfo Duarte

pkg/v1/tkg/managementcomponents/management_component_install.go

@@ -104,6 +104,9 @@ func pausePackageInstallReconciliation(ctx context.Context, clusterClient cluste
 // PausedAdoonLifecycleManagement pauses/unpauses the lifecycle management of addon package with given name and namespace
 func PauseAddonLifecycleManagement(mcip *ManagementComponentsInstallOptions, addonName, namespace string) error {
 	clusterClient, err := clusterclient.NewClient(mcip.ClusterOptions.Kubeconfig, mcip.ClusterOptions.Kubecontext, clusterclient.Options{})
+	if err != nil {
+		return err
+	}
 	clusterName, err := clusterClient.GetCurrentClusterName(mcip.ClusterOptions.Kubecontext)
 	if err != nil {
 		return err
@@ -142,7 +145,7 @@ func InstallManagementComponents(mcip *ManagementComponentsInstallOptions) error
 		panic(err)
 	}
 
-	// TODO (adduarte) add pkgi delete call
+	err = NoopDeletePackageInstall(mcip, "addons-manager", constants.TkgNamespace)
 
 	// TODO (adduarte) add addonsecret delete call
 
@@ -281,3 +284,33 @@ func WaitForManagementPackages(clusterClient clusterclient.Client, packageInstal
 	}
 	return nil
 }
+
+// NoopDeletePackageInstall sets spec.noopdelete = true before deleting the package install
+func NoopDeletePackageInstall(mcip *ManagementComponentsInstallOptions, addonName, namespace string) error {
+	clusterClient, err := clusterclient.NewClient(mcip.ClusterOptions.Kubeconfig, mcip.ClusterOptions.Kubecontext, clusterclient.Options{})
+	if err != nil {
+		return err
+	}
+	pkgiName := fmt.Sprintf("tanzu-%s", addonName)
+
+	jsonPatch := []map[string]interface{}{
+		{
+			"op":    "add",
+			"path":  "/spec/noopDelete",
+			"value": true,
+		},
+	}
+	payloadBytes, err := json.Marshal(jsonPatch)
+	if err != nil {
+		return errors.Wrap(err, "unable to generate json patch")
+	}
+	pkgi := &kappipkg.PackageInstall{}
+	err = clusterClient.PatchResource(pkgi, pkgiName, namespace, string(payloadBytes), types.JSONPatchType, nil)
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+	if err != nil {
+		return errors.Wrapf(err, "failed to patch %s packageinstall", pkgiName)
+	}
+	return nil
+}