fix integration tests

Author: abaruni

controllers/contentlibrary/clustercontentlibraryitem/clustercontentlibraryitem_controller.go

@@ -8,6 +8,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	imgregv1a1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha1"
+	imgregv1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha2"
 
 	"github.com/vmware-tanzu/vm-operator/controllers/contentlibrary/utils"
 	pkgcfg "github.com/vmware-tanzu/vm-operator/pkg/config"
@@ -22,7 +23,7 @@ import (
 // AddToManager adds this package's controller to the provided manager.
 func AddToManager(ctx *pkgctx.ControllerManagerContext, mgr manager.Manager) error {
 	if pkgcfg.FromContext(ctx).Features.InventoryContentLibrary {
-		return utils.AddToManagerV1A2(ctx, mgr, &imgregv1a1.ClusterContentLibraryItem{})
+		return utils.AddToManagerV1A2(ctx, mgr, &imgregv1.ClusterContentLibraryItem{})
 	}
 	return utils.AddToManager(ctx, mgr, &imgregv1a1.ClusterContentLibraryItem{})
 }

controllers/contentlibrary/contentlibraryitem/contentlibraryitem_controller.go

@@ -8,6 +8,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	imgregv1a1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha1"
+	imgregv1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha2"
 
 	"github.com/vmware-tanzu/vm-operator/controllers/contentlibrary/utils"
 	pkgcfg "github.com/vmware-tanzu/vm-operator/pkg/config"
@@ -22,7 +23,7 @@ import (
 // AddToManager adds this package's controller to the provided manager.
 func AddToManager(ctx *pkgctx.ControllerManagerContext, mgr manager.Manager) error {
 	if pkgcfg.FromContext(ctx).Features.InventoryContentLibrary {
-		return utils.AddToManagerV1A2(ctx, mgr, &imgregv1a1.ContentLibraryItem{})
+		return utils.AddToManagerV1A2(ctx, mgr, &imgregv1.ContentLibraryItem{})
 	}
 	return utils.AddToManager(ctx, mgr, &imgregv1a1.ContentLibraryItem{})
 }

test/builder/test_suite.go

@@ -532,6 +532,29 @@ func (s *TestSuite) beforeSuiteForIntegrationTesting() {
 		Expect(s.config).ToNot(BeNil())
 	})
 
+	By("updating image registry CRD storage version", func() {
+		// Update storage version of ContentLibraryItems if necessary
+		cliCrd := s.GetInstalledCRD("contentlibraryitems.imageregistry.vmware.com")
+		Expect(cliCrd).ToNot(BeNil())
+		s.UpdateCRDStorage(cliCrd)
+		// Update storage version of ClusterContentLibraryItems if necessary
+		ccliCrd := s.GetInstalledCRD("clustercontentlibraryitems.imageregistry.vmware.com")
+		Expect(ccliCrd).ToNot(BeNil())
+		s.UpdateCRDStorage(ccliCrd)
+		// Update storage version of ContentLibraries if necessary
+		clCrd := s.GetInstalledCRD("contentlibraries.imageregistry.vmware.com")
+		Expect(clCrd).ToNot(BeNil())
+		s.UpdateCRDStorage(clCrd)
+		// Update storage version of ClusterContentLibraries if necessary
+		cclCrd := s.GetInstalledCRD("clustercontentlibraries.imageregistry.vmware.com")
+		Expect(cclCrd).ToNot(BeNil())
+		s.UpdateCRDStorage(cclCrd)
+		// Update storage version of ContentLibraryItemImportRequests if necessary
+		cliImportReqCrd := s.GetInstalledCRD("contentlibraryitemimportrequests.imageregistry.vmware.com")
+		Expect(cliImportReqCrd).ToNot(BeNil())
+		s.UpdateCRDStorage(cliImportReqCrd)
+	})
+
 	// If one or more webhooks are being tested then go ahead and generate a
 	// PKI toolchain to use with the webhook server.
 	if s.isWebhookTest() {
@@ -631,6 +654,32 @@ func (s *TestSuite) GetInstalledCRD(crdName string) *apiextensionsv1.CustomResou
 	return nil
 }
 
+func (s *TestSuite) UpdateCRDStorage(oldCrd *apiextensionsv1.CustomResourceDefinition) {
+
+	err := envtest.UninstallCRDs(s.envTest.Config, envtest.CRDInstallOptions{
+		CRDs: []*apiextensionsv1.CustomResourceDefinition{oldCrd},
+	})
+	Expect(err).ToNot(HaveOccurred())
+
+	crds := make([]*apiextensionsv1.CustomResourceDefinition, 0)
+	updatedCrd := updateImgRegStorageVersion(s.Context, *oldCrd)
+
+	Eventually(func() error {
+		newCrd := &apiextensionsv1.CustomResourceDefinition{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:        updatedCrd.Name,
+				Annotations: updatedCrd.Annotations,
+			},
+			Spec: updatedCrd.Spec,
+		}
+		crds, err = envtest.InstallCRDs(s.envTest.Config, envtest.CRDInstallOptions{
+			CRDs: []*apiextensionsv1.CustomResourceDefinition{newCrd},
+		})
+		return err
+	}).ShouldNot(HaveOccurred())
+	s.envTest.CRDs = append(s.envTest.CRDs, crds...)
+}
+
 func (s *TestSuite) UpdateCRDScope(oldCrd *apiextensionsv1.CustomResourceDefinition, newScope string) {
 	// crd.spec.scope is immutable, uninstall first
 	err := envtest.UninstallCRDs(s.envTest.Config, envtest.CRDInstallOptions{

test/builder/util.go

@@ -13,6 +13,8 @@ import (
 	"os"
 	"path/filepath"
 
+	pkgcfg "github.com/vmware-tanzu/vm-operator/pkg/config"
+
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -47,6 +49,37 @@ func applyFeatureStateFnsToCRD(
 	return crd
 }
 
+func updateImgRegStorageVersion(ctx context.Context, crd apiextensionsv1.CustomResourceDefinition) apiextensionsv1.CustomResourceDefinition {
+
+	v1a1Idx := indexOfVersion(crd, "v1alpha1")
+	v1a2Idx := indexOfVersion(crd, "v1alpha2")
+
+	if pkgcfg.FromContext(ctx).Features.InventoryContentLibrary {
+		if v1a1Idx >= 0 {
+			crd.Spec.Versions[v1a1Idx].Storage = !(v1a2Idx >= 0) //nolint:staticcheck
+			crd.Spec.Versions[v1a1Idx].Served = true
+		}
+
+		if v1a2Idx >= 0 {
+			crd.Spec.Versions[v1a2Idx].Storage = true
+			crd.Spec.Versions[v1a2Idx].Served = true
+		}
+	} else if v1a1Idx >= 0 {
+		crd.Spec.Versions[v1a1Idx].Storage = true
+		crd.Spec.Versions[v1a1Idx].Served = true
+
+		if v1a2Idx >= 0 {
+			var zeroVal apiextensionsv1.CustomResourceDefinitionVersion
+
+			copy(crd.Spec.Versions[v1a2Idx:], crd.Spec.Versions[v1a2Idx+1:])
+			crd.Spec.Versions[len(crd.Spec.Versions)-1] = zeroVal
+			crd.Spec.Versions = crd.Spec.Versions[:len(crd.Spec.Versions)-1]
+		}
+	}
+
+	return crd
+}
+
 // indexOfVersion returns the index of the specified schema version for a given
 // CRD. This function is useful for writing the functions that are passed into
 // the applyFeatureStateFnsToCRD function.