fix: add vpa check to e2e test

Author: exdx

test/e2e/bundle_e2e_test.go

@@ -2,6 +2,8 @@ package e2e
 
 import (
 	"context"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -17,25 +19,25 @@ var _ = Describe("Installing bundles with new object types", func() {
 	var (
 		kubeClient     operatorclient.ClientInterface
 		operatorClient versioned.Interface
+		dynamicClient  dynamic.Interface
 	)
 
 	BeforeEach(func() {
 		kubeClient = ctx.Ctx().KubeClient()
 		operatorClient = ctx.Ctx().OperatorClient()
+		dynamicClient = ctx.Ctx().DynamicClient()
 	})
 
 	AfterEach(func() {
 		cleaner.NotifyTestComplete(true)
 	})
 
-	When("a bundle with a pdb, priorityclass, and vpa object is installed", func() {
+	When("a bundle with a pdb, priorityclass, and VPA object is installed", func() {
+		By("including the VPA CRD in the CSV")
 		const (
-			packageName       = "busybox"
-			channelName       = "alpha"
-			subName           = "test-subscription"
-			pdbName           = "busybox-pdb"
-			priorityClassName = "high-priority"
-			vpaName           = "busybox-vpa"
+			packageName = "busybox"
+			channelName = "alpha"
+			subName     = "test-subscription"
 		)
 
 		BeforeEach(func() {
@@ -74,6 +76,21 @@ var _ = Describe("Installing bundles with new object types", func() {
 		})
 
 		It("should create the additional bundle objects", func() {
+			const (
+				vpaGroup          = "autoscaling.k8s.io"
+				vpaVersion        = "v1"
+				vpaResource       = "verticalpodautoscalers"
+				pdbName           = "busybox-pdb"
+				priorityClassName = "high-priority"
+				vpaName           = "busybox-vpa"
+			)
+
+			var resource = schema.GroupVersionResource{
+				Group:    vpaGroup,
+				Version:  vpaVersion,
+				Resource: vpaResource,
+			}
+
 			// confirm extra bundle objects are installed
 			Eventually(func() error {
 				_, err := kubeClient.KubernetesInterface().PolicyV1beta1().PodDisruptionBudgets(testNamespace).Get(context.TODO(), pdbName, metav1.GetOptions{})
@@ -85,7 +102,10 @@ var _ = Describe("Installing bundles with new object types", func() {
 				return err
 			}).Should(Succeed(), "expected no error getting priorityclass object associated with CSV")
 
-			// TODO check VPA object
+			Eventually(func() error {
+				_, err := dynamicClient.Resource(resource).Namespace(testNamespace).Get(context.TODO(), vpaName, metav1.GetOptions{})
+				return err
+			}).Should(Succeed(), "expected no error finding vpa object associated with csv")
 		})
 	})
 })