update e2e test

Author: horis233

test/e2e/csv_e2e_test.go

@@ -461,15 +461,10 @@ var _ = Describe("ClusterServiceVersion", func() {
 	// TODO: same test but create serviceaccount instead
 	It("create requirements met CRD", func() {
 
-		sa := corev1.ServiceAccount{}
-		sa.SetName(genName("sa-"))
-		sa.SetNamespace(testNamespace)
-		_, err := c.CreateServiceAccount(&sa)
-		Expect(err).ShouldNot(HaveOccurred(), "could not create ServiceAccount %#v", sa)
-
+		saName := genName("sa-")
 		permissions := []v1alpha1.StrategyDeploymentPermissions{
 			{
-				ServiceAccountName: sa.GetName(),
+				ServiceAccountName: saName,
 				Rules: []rbacv1.PolicyRule{
 					{
 						Verbs:     []string{"create"},
@@ -482,7 +477,7 @@ var _ = Describe("ClusterServiceVersion", func() {
 
 		clusterPermissions := []v1alpha1.StrategyDeploymentPermissions{
 			{
-				ServiceAccountName: sa.GetName(),
+				ServiceAccountName: saName,
 				Rules: []rbacv1.PolicyRule{
 					{
 						Verbs:     []string{"get"},
@@ -551,6 +546,18 @@ var _ = Describe("ClusterServiceVersion", func() {
 		fetchedCSV, err := fetchCSV(crc, csv.Name, testNamespace, csvPendingChecker)
 		Expect(err).ShouldNot(HaveOccurred())
 
+		sa := corev1.ServiceAccount{}
+		sa.SetName(saName)
+		sa.SetNamespace(testNamespace)
+		sa.SetOwnerReferences([]metav1.OwnerReference{{
+			Name:       fetchedCSV.GetName(),
+			APIVersion: v1alpha1.ClusterServiceVersionAPIVersion,
+			Kind:       v1alpha1.ClusterServiceVersionKind,
+			UID:        fetchedCSV.GetUID(),
+		}})
+		_, err = c.CreateServiceAccount(&sa)
+		Expect(err).ShouldNot(HaveOccurred(), "could not create ServiceAccount %#v", sa)
+
 		crd := apiextensions.CustomResourceDefinition{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: crdName,

test/e2e/operator_groups_e2e_test.go

@@ -1399,7 +1399,7 @@ var _ = Describe("Operator Group", func() {
 				Name: role.GetName(),
 			},
 		}
-		_, err = c.CreateServiceAccount(serviceAccount)
+		createdServiceAccount, err := c.CreateServiceAccount(serviceAccount)
 		require.NoError(GinkgoT(), err)
 		defer func() {
 			c.DeleteServiceAccount(serviceAccount.GetNamespace(), serviceAccount.GetName(), metav1.NewDeleteOptions(0))
@@ -1425,6 +1425,12 @@ var _ = Describe("Operator Group", func() {
 		createdCSV, err := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Create(context.TODO(), &aCSV, metav1.CreateOptions{})
 		require.NoError(GinkgoT(), err)
 
+		ownerutil.AddNonBlockingOwner(createdServiceAccount, createdCSV)
+		err = ownerutil.AddOwnerLabels(createdServiceAccount, createdCSV)
+		require.NoError(GinkgoT(), err)
+		_, err = c.UpdateServiceAccount(createdServiceAccount)
+		require.NoError(GinkgoT(), err)
+
 		err = ownerutil.AddOwnerLabels(createdRole, createdCSV)
 		require.NoError(GinkgoT(), err)
 		_, err = c.UpdateRole(createdRole)