fix: remove v1beta1 CRDs from all e2e tests; add deprecation e2e tests

Signed-off-by: Daniel Sover <[email protected]>

Author: exdx

test/e2e/bundle_e2e_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 
 	"github.com/ghodss/yaml"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
@@ -39,6 +39,7 @@ var _ = Describe("Installing bundles with new object types", func() {
 		TearDown(testNamespace)
 	})
 
+	// TODO bump vpa CRD to v1, otherwise this test will now fail
 	When("a bundle with a pdb, priorityclass, and VPA object is installed", func() {
 		const (
 			packageName = "busybox"
@@ -76,7 +77,7 @@ var _ = Describe("Installing bundles with new object types", func() {
 
 			// ensure vpa crd is established and accepted on the cluster before continuing
 			Eventually(func() (bool, error) {
-				crd, err := kubeClient.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.TODO(), vpaCRD.GetName(), metav1.GetOptions{})
+				crd, err := kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), vpaCRD.GetName(), metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
@@ -167,19 +168,19 @@ var _ = Describe("Installing bundles with new object types", func() {
 	})
 })
 
-func crdReady(status *apiextensionsv1beta1.CustomResourceDefinitionStatus) bool {
+func crdReady(status *apiextensionsv1.CustomResourceDefinitionStatus) bool {
 	if status == nil {
 		return false
 	}
 	established, namesAccepted := false, false
 	for _, cdt := range status.Conditions {
 		switch cdt.Type {
-		case apiextensionsv1beta1.Established:
-			if cdt.Status == apiextensionsv1beta1.ConditionTrue {
+		case apiextensionsv1.Established:
+			if cdt.Status == apiextensionsv1.ConditionTrue {
 				established = true
 			}
-		case apiextensionsv1beta1.NamesAccepted:
-			if cdt.Status == apiextensionsv1beta1.ConditionTrue {
+		case apiextensionsv1.NamesAccepted:
+			if cdt.Status == apiextensionsv1.ConditionTrue {
 				namesAccepted = true
 			}
 		}

test/e2e/crd_e2e_test.go

@@ -14,95 +14,13 @@ import (
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var _ = Describe("CRD Versions", func() {
 	AfterEach(func() { TearDown(testNamespace) }, float64(30))
 
-	It("creates v1beta1 crds with a v1beta1 schema successfully", func() {
-		By("This test proves that OLM is able to handle v1beta1 CRDs successfully. Creating v1 CRDs has more " +
-			"restrictions around the schema. v1beta1 validation schemas are not necessarily valid in v1. " +
-			"OLM should support both v1beta1 and v1 CRDs")
-		c := newKubeClient()
-		crc := newCRClient()
-
-		mainPackageName := genName("nginx-update2-")
-		mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
-		stableChannel := "stable"
-
-		crdPlural := genName("ins-v1beta1-")
-		crdName := crdPlural + ".cluster.com"
-		mainCRD := apiextensions.CustomResourceDefinition{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: crdName,
-			},
-			Spec: apiextensions.CustomResourceDefinitionSpec{
-				Group: "cluster.com",
-				Versions: []apiextensions.CustomResourceDefinitionVersion{
-					{
-						Name:    "v1alpha1",
-						Served:  true,
-						Storage: true,
-					},
-				},
-				Names: apiextensions.CustomResourceDefinitionNames{
-					Plural:   crdPlural,
-					Singular: crdPlural,
-					Kind:     crdPlural,
-					ListKind: "list" + crdPlural,
-				},
-				Scope: "Namespaced",
-				// this validation is not a valid v1 structural schema because the "type: object" field is missing
-				Validation: &apiextensions.CustomResourceValidation{
-					OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
-						Description: "my crd schema",
-					},
-				},
-			},
-		}
-
-		mainCSV := newCSV(mainPackageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{mainCRD}, nil, nil)
-		mainCatalogName := genName("mock-ocs-main-update2-")
-		mainManifests := []registry.PackageManifest{
-			{
-				PackageName: mainPackageName,
-				Channels: []registry.PackageChannel{
-					{Name: stableChannel, CurrentCSVName: mainPackageStable},
-				},
-				DefaultChannelName: stableChannel,
-			},
-		}
-
-		// Create the catalog sources
-		_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, testNamespace, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []operatorsv1alpha1.ClusterServiceVersion{mainCSV})
-		defer cleanupMainCatalogSource()
-
-		// Attempt to get the catalog source before creating install plan
-		_, err := fetchCatalogSourceOnStatus(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
-		Expect(err).ToNot(HaveOccurred())
-
-		subscriptionName := genName("sub-nginx-update2-")
-		subscriptionCleanup := createSubscriptionForCatalog(crc, testNamespace, subscriptionName, mainCatalogName, mainPackageName, stableChannel, "", operatorsv1alpha1.ApprovalAutomatic)
-		defer subscriptionCleanup()
-
-		subscription, err := fetchSubscription(crc, testNamespace, subscriptionName, subscriptionHasInstallPlanChecker)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(subscription).ToNot(Equal(nil))
-		Expect(subscription.Status.InstallPlanRef).ToNot(Equal(nil))
-		Expect(mainCSV.GetName()).To(Equal(subscription.Status.CurrentCSV))
-
-		installPlanName := subscription.Status.InstallPlanRef.Name
-
-		// Wait for InstallPlan to be status: Complete before checking resource presence
-		fetchedInstallPlan, err := fetchInstallPlan(GinkgoT(), crc, installPlanName, buildInstallPlanPhaseCheckFunc(operatorsv1alpha1.InstallPlanPhaseComplete))
-		Expect(err).ToNot(HaveOccurred())
-		GinkgoT().Logf("Install plan %s fetched with status %s", fetchedInstallPlan.GetName(), fetchedInstallPlan.Status.Phase)
-		Expect(fetchedInstallPlan.Status.Phase).To(Equal(operatorsv1alpha1.InstallPlanPhaseComplete))
-	})
-
 	It("creates v1 CRDs with a v1 schema successfully", func() {
 		By("v1 crds with a valid openapiv3 schema should be created successfully by OLM")
 		c := newKubeClient()
@@ -112,7 +30,7 @@ var _ = Describe("CRD Versions", func() {
 		mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
 		stableChannel := "stable"
 
-		crdPlural := genName("ins-v1beta1-")
+		crdPlural := genName("ins-")
 		crdName := crdPlural + ".cluster.com"
 		v1crd := apiextensionsv1.CustomResourceDefinition{
 			ObjectMeta: metav1.ObjectMeta{
@@ -185,7 +103,7 @@ var _ = Describe("CRD Versions", func() {
 		mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
 		stableChannel := "stable"
 
-		crdPlural := genName("ins-v1beta1-")
+		crdPlural := genName("ins-")
 		crdName := crdPlural + ".cluster.com"
 		oldCRD := apiextensions.CustomResourceDefinition{
 			ObjectMeta: metav1.ObjectMeta{
@@ -352,20 +270,20 @@ var _ = Describe("CRD Versions", func() {
 		crdName := crdPlural + ".cluster.com"
 		crdGroup := "cluster.com"
 
-		oldCRD := &apiextensionsv1beta1.CustomResourceDefinition{
+		oldCRD := &apiextensionsv1.CustomResourceDefinition{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: crdName,
 			},
-			Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
+			Spec: apiextensionsv1.CustomResourceDefinitionSpec{
 				Group: crdGroup,
-				Versions: []apiextensionsv1beta1.CustomResourceDefinitionVersion{
+				Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
 					{
 						Name:    "v1alpha1",
 						Served:  true,
 						Storage: true,
 					},
 				},
-				Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
+				Names: apiextensionsv1.CustomResourceDefinitionNames{
 					Plural:   crdPlural,
 					Singular: crdPlural,
 					Kind:     crdPlural,
@@ -374,12 +292,12 @@ var _ = Describe("CRD Versions", func() {
 				Scope: "Namespaced",
 			},
 		}
-		_, err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.TODO(), oldCRD, metav1.CreateOptions{})
+		_, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Create(context.TODO(), oldCRD, metav1.CreateOptions{})
 		Expect(err).ToNot(HaveOccurred(), "error creating old CRD")
 
 		// wrap CRD update in a poll because of the object has been modified related errors
 		Eventually(func() error {
-			oldCRD, err = c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.TODO(), oldCRD.GetName(), metav1.GetOptions{})
+			oldCRD, err = c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), oldCRD.GetName(), metav1.GetOptions{})
 			if err != nil {
 				return err
 			}
@@ -388,13 +306,13 @@ var _ = Describe("CRD Versions", func() {
 			// set v1alpha1 to no longer served
 			oldCRD.Spec.Versions[0].Storage = false
 			// update CRD on-cluster with a new version
-			oldCRD.Spec.Versions = append(oldCRD.Spec.Versions, apiextensionsv1beta1.CustomResourceDefinitionVersion{
+			oldCRD.Spec.Versions = append(oldCRD.Spec.Versions, apiextensionsv1.CustomResourceDefinitionVersion{
 				Name:    "v1alpha2",
 				Served:  true,
 				Storage: true,
 			})
 
-			updatedCRD, err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Update(context.TODO(), oldCRD, metav1.UpdateOptions{})
+			updatedCRD, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Update(context.TODO(), oldCRD, metav1.UpdateOptions{})
 			if err != nil {
 				return err
 			}
@@ -471,10 +389,10 @@ var _ = Describe("CRD Versions", func() {
 		))
 
 		// update CRD status to remove the v1alpha1 stored version
-		newCRD, err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.TODO(), oldCRD.GetName(), metav1.GetOptions{})
+		newCRD, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), oldCRD.GetName(), metav1.GetOptions{})
 		Expect(err).ToNot(HaveOccurred(), "error getting new CRD")
 		newCRD.Status.StoredVersions = []string{"v1alpha2"}
-		newCRD, err = c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().UpdateStatus(context.TODO(), newCRD, metav1.UpdateOptions{})
+		newCRD, err = c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().UpdateStatus(context.TODO(), newCRD, metav1.UpdateOptions{})
 		Expect(err).ToNot(HaveOccurred(), "error updating new CRD")
 		GinkgoT().Logf("new crd status stored versions: %#v", newCRD.Status.StoredVersions) // only v1alpha2 should be in the status now
 

test/e2e/csv_e2e_test.go

@@ -16,7 +16,6 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
@@ -4120,13 +4119,13 @@ func createCSV(c operatorclient.ClientInterface, crc versioned.Interface, csv v1
 
 func buildCRDCleanupFunc(c operatorclient.ClientInterface, crdName string) cleanupFunc {
 	return func() {
-		err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Delete(context.TODO(), crdName, *metav1.NewDeleteOptions(immediateDeleteGracePeriod))
+		err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), crdName, *metav1.NewDeleteOptions(immediateDeleteGracePeriod))
 		if err != nil {
 			fmt.Println(err)
 		}
 
 		waitForDelete(func() error {
-			_, err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.TODO(), crdName, metav1.GetOptions{})
+			_, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), crdName, metav1.GetOptions{})
 			return err
 		})
 	}
@@ -4147,18 +4146,18 @@ func buildAPIServiceCleanupFunc(c operatorclient.ClientInterface, apiServiceName
 }
 
 func createCRD(c operatorclient.ClientInterface, crd apiextensions.CustomResourceDefinition) (cleanupFunc, error) {
-	out := &v1beta1.CustomResourceDefinition{}
+	out := &apiextensionsv1.CustomResourceDefinition{}
 	scheme := runtime.NewScheme()
 	if err := apiextensions.AddToScheme(scheme); err != nil {
 		return nil, err
 	}
-	if err := v1beta1.AddToScheme(scheme); err != nil {
+	if err := apiextensionsv1.AddToScheme(scheme); err != nil {
 		return nil, err
 	}
 	if err := scheme.Convert(&crd, out, nil); err != nil {
 		return nil, err
 	}
-	_, err := c.ApiextensionsInterface().ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.TODO(), out, metav1.CreateOptions{})
+	_, err := c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Create(context.TODO(), out, metav1.CreateOptions{})
 	if err != nil {
 		return nil, err
 	}

test/e2e/deprecated_e2e_test.go

@@ -0,0 +1,6 @@
+package e2e
+
+// TODO
+
+// v1beta1 CRD in installplan fails
+// v1beta1 RBAC in an installplan fails