Regroup packaging CRs

Author: ewrenn8

cmd/controller/handlers/installed_pkg_version_handler.go

@@ -7,8 +7,8 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
-	ipkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/installpackage/v1alpha1"
-	pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/packages/v1alpha1"
+	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
+	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned"
 	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -68,8 +68,8 @@ func (ipvh *InstalledPkgVersionHandler) Generic(evt event.GenericEvent, q workqu
 }
 
 func (ipvh *InstalledPkgVersionHandler) enqueueEligibleInstalledPackages(q workqueue.RateLimitingInterface, obj runtime.Object) error {
-	pv := obj.(*pkgv1alpha1.PackageVersion)
-	installedPkgList, err := ipvh.client.InstallV1alpha1().InstalledPackages("").List(context.Background(), metav1.ListOptions{})
+	pv := obj.(*datapkgingv1alpha1.PackageVersion)
+	installedPkgList, err := ipvh.client.PackagingV1alpha1().InstalledPackages("").List(context.Background(), metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
@@ -90,7 +90,7 @@ func (ipvh *InstalledPkgVersionHandler) enqueueEligibleInstalledPackages(q workq
 	return nil
 }
 
-func (ipvh *InstalledPkgVersionHandler) isEligibleForVersionUpgrade(version string, installedPkg ipkgv1alpha1.InstalledPackage) bool {
+func (ipvh *InstalledPkgVersionHandler) isEligibleForVersionUpgrade(version string, installedPkg pkgingv1alpha1.InstalledPackage) bool {
 	if installedPkg.Spec.PackageVersionRef == nil {
 		return false
 	}

cmd/controller/handlers/installed_pkg_version_handler_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-logr/logr"
 
-	instpackagev1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/installpackage/v1alpha1"
-	packagev1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/packages/v1alpha1"
+	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
+	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -25,12 +25,12 @@ import (
 func TestOnlyEligiblePackagesAreEnqueued(t *testing.T) {
 	q := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
 
-	eligibleInstalledPkg := instpackagev1.InstalledPackage{
+	eligibleInstalledPkg := pkgingv1alpha1.InstalledPackage{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "expected-pkg",
 		},
-		Spec: instpackagev1.InstalledPackageSpec{
-			PackageVersionRef: &instpackagev1.PackageVersionRef{
+		Spec: pkgingv1alpha1.InstalledPackageSpec{
+			PackageVersionRef: &pkgingv1alpha1.PackageVersionRef{
 				PackageName: "expec-pkg",
 				VersionSelection: &v1alpha1.VersionSelectionSemver{
 					Constraints: ">=1.0.0",
@@ -39,12 +39,12 @@ func TestOnlyEligiblePackagesAreEnqueued(t *testing.T) {
 		},
 	}
 
-	ineligibleInstalledPkg := instpackagev1.InstalledPackage{
+	ineligibleInstalledPkg := pkgingv1alpha1.InstalledPackage{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "expected-pkg-ineligible",
 		},
-		Spec: instpackagev1.InstalledPackageSpec{
-			PackageVersionRef: &instpackagev1.PackageVersionRef{
+		Spec: pkgingv1alpha1.InstalledPackageSpec{
+			PackageVersionRef: &pkgingv1alpha1.PackageVersionRef{
 				PackageName: "expec-pkg",
 				VersionSelection: &v1alpha1.VersionSelectionSemver{
 					Constraints: "<1.0.0",
@@ -58,8 +58,8 @@ func TestOnlyEligiblePackagesAreEnqueued(t *testing.T) {
 	ipvh := handlers.NewInstalledPkgVersionHandler(kappcs, &EmptyLog{})
 
 	event := event.GenericEvent{
-		Object: &packagev1.PackageVersion{
-			Spec: packagev1.PackageVersionSpec{
+		Object: &datapkgingv1alpha1.PackageVersion{
+			Spec: datapkgingv1alpha1.PackageVersionSpec{
 				PackageName: "expec-pkg",
 				Version:     "1.5.0",
 			},