(e2e) fix e2e test flakes

Author: tkashem

test/e2e/subscription_e2e_test.go

@@ -407,7 +407,7 @@ func createSubscription(t *testing.T, crc versioned.Interface, namespace, name,
 	return buildSubscriptionCleanupFunc(t, crc, subscription)
 }
 
-func createSubscriptionWithPodConfig(t *testing.T, crc versioned.Interface, namespace, name, packageName, channel string, approval v1alpha1.Approval, config v1alpha1.SubscriptionConfig) cleanupFunc {
+func createSubscriptionForCatalog(t *testing.T, crc versioned.Interface, namespace, name, catalog, packageName, channel, startingCSV string, approval v1alpha1.Approval) cleanupFunc {
 	subscription := &v1alpha1.Subscription{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       v1alpha1.SubscriptionKind,
@@ -418,12 +418,12 @@ func createSubscriptionWithPodConfig(t *testing.T, crc versioned.Interface, name
 			Name:      name,
 		},
 		Spec: &v1alpha1.SubscriptionSpec{
-			CatalogSource:          catalogSourceName,
+			CatalogSource:          catalog,
 			CatalogSourceNamespace: namespace,
 			Package:                packageName,
 			Channel:                channel,
+			StartingCSV:            startingCSV,
 			InstallPlanApproval:    approval,
-			Config:                 config,
 		},
 	}
 
@@ -432,7 +432,7 @@ func createSubscriptionWithPodConfig(t *testing.T, crc versioned.Interface, name
 	return buildSubscriptionCleanupFunc(t, crc, subscription)
 }
 
-func createSubscriptionForCatalog(t *testing.T, crc versioned.Interface, namespace, name, catalog, packageName, channel, startingCSV string, approval v1alpha1.Approval) cleanupFunc {
+func createSubscriptionForCatalogWithSpec(t *testing.T, crc versioned.Interface, namespace, name string, spec *v1alpha1.SubscriptionSpec) cleanupFunc {
 	subscription := &v1alpha1.Subscription{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       v1alpha1.SubscriptionKind,
@@ -442,14 +442,7 @@ func createSubscriptionForCatalog(t *testing.T, crc versioned.Interface, namespa
 			Namespace: namespace,
 			Name:      name,
 		},
-		Spec: &v1alpha1.SubscriptionSpec{
-			CatalogSource:          catalog,
-			CatalogSourceNamespace: namespace,
-			Package:                packageName,
-			Channel:                channel,
-			StartingCSV:            startingCSV,
-			InstallPlanApproval:    approval,
-		},
+		Spec: spec,
 	}
 
 	subscription, err := crc.OperatorsV1alpha1().Subscriptions(namespace).Create(subscription)
@@ -1165,15 +1158,10 @@ func TestCreateNewSubscriptionWithPodConfig(t *testing.T) {
 		return proxyEnv
 	}
 
-	c := newKubeClient(t)
-	crc := newCRClient(t)
+	kubeClient := newKubeClient(t)
+	crClient := newCRClient(t)
 	config := newConfigClient(t)
 
-	defer func() {
-		require.NoError(t, crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{}))
-	}()
-	require.NoError(t, initCatalog(t, c, crc))
-
 	podEnv := []corev1.EnvVar{
 		corev1.EnvVar{
 			Name:  "MY_ENV_VARIABLE1",
@@ -1188,22 +1176,31 @@ func TestCreateNewSubscriptionWithPodConfig(t *testing.T) {
 		Env: podEnv,
 	}
 
-	subscriptionName := "mysub-podconfig"
-	cleanup := createSubscriptionWithPodConfig(t, crc, testNamespace, subscriptionName, testPackageName, betaChannel, v1alpha1.ApprovalAutomatic, podConfig)
-	defer cleanup()
+	permissions := deploymentPermissions(t)
+	catsrc, subSpec, catsrcCleanup := newCatalogSource(t, kubeClient, crClient, "podconfig", testNamespace, permissions)
+	defer catsrcCleanup()
+
+	// Ensure that the catalog source is resolved before we create a subscription.
+	_, err := fetchCatalogSource(t, crClient, catsrc.GetName(), testNamespace, catalogSourceRegistryPodSynced)
+	require.NoError(t, err)
+
+	subscriptionName := genName("podconfig-sub-")
+	subSpec.Config = podConfig
+	cleanupSubscription := createSubscriptionForCatalogWithSpec(t, crClient, testNamespace, subscriptionName, subSpec)	
+	defer cleanupSubscription()
 
-	subscription, err := fetchSubscription(t, crc, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
+	subscription, err := fetchSubscription(t, crClient, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
 	require.NoError(t, err)
 	require.NotNil(t, subscription)
 
-	csv, err := fetchCSV(t, crc, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
+	csv, err := fetchCSV(t, crClient, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
 	require.NoError(t, err)
 
 	proxyEnv := proxyEnvVarFunc(t, config)
 	expected := podEnv
 	expected = append(expected, proxyEnv...)
 
-	checkDeploymentWithPodConfiguration(t, c, csv, podConfig.Env)
+	checkDeploymentWithPodConfiguration(t, kubeClient, csv, podConfig.Env)
 }
 
 func checkDeploymentWithPodConfiguration(t *testing.T, client operatorclient.ClientInterface, csv *v1alpha1.ClusterServiceVersion, envVar []corev1.EnvVar) {

test/e2e/user_defined_sa_test.go

@@ -40,7 +40,8 @@ func TestUserDefinedServiceAccountWithNoPermission(t *testing.T) {
 	_, cleanupOG := newOperatorGroupWithServiceAccount(t, crclient, namespace, ogName, saName)
 	defer cleanupOG()
 
-	catsrc, subSpec, catsrcCleanup := newCatalogSource(t, kubeclient, crclient, namespace)
+	permissions := deploymentPermissions(t)
+	catsrc, subSpec, catsrcCleanup := newCatalogSource(t, kubeclient, crclient, "scoped", namespace, permissions)
 	defer catsrcCleanup()
 
 	// Ensure that the catalog source is resolved before we create a subscription.
@@ -96,7 +97,8 @@ func TestUserDefinedServiceAccountWithPermission(t *testing.T) {
 	_, cleanupOG := newOperatorGroupWithServiceAccount(t, crclient, namespace, ogName, saName)
 	defer cleanupOG()
 
-	catsrc, subSpec, catsrcCleanup := newCatalogSource(t, kubeclient, crclient, namespace)
+	permissions := deploymentPermissions(t)
+	catsrc, subSpec, catsrcCleanup := newCatalogSource(t, kubeclient, crclient, "scoped", namespace, permissions)
 	defer catsrcCleanup()
 
 	// Ensure that the catalog source is resolved before we create a subscription.
@@ -194,7 +196,7 @@ func newOperatorGroupWithServiceAccount(t *testing.T, client versioned.Interface
 	return
 }
 
-func newCatalogSource(t *testing.T, kubeclient operatorclient.ClientInterface, crclient versioned.Interface, namespace string) (catsrc *v1alpha1.CatalogSource, subscriptionSpec *v1alpha1.SubscriptionSpec, cleanup cleanupFunc) {
+func newCatalogSource(t *testing.T, kubeclient operatorclient.ClientInterface, crclient versioned.Interface, prefix, namespace string, permissions []install.StrategyDeploymentPermissions) (catsrc *v1alpha1.CatalogSource, subscriptionSpec *v1alpha1.SubscriptionSpec, cleanup cleanupFunc) {
 	crdPlural := genName("ins")
 	crdName := crdPlural + ".cluster.com"
 
@@ -215,12 +217,15 @@ func newCatalogSource(t *testing.T, kubeclient operatorclient.ClientInterface, c
 		},
 	}
 
+	prefixFunc := func(s string) string {
+		return fmt.Sprintf("%s-%s-", prefix, s)
+	}
+
 	// Create CSV
-	packageName := genName("nginx-")
+	packageName := genName(prefixFunc("package"))
 	stableChannel := "stable"
 
-	permissions := deploymentPermissions(t)
-	namedStrategy := newNginxInstallStrategy(genName("dep-"), permissions, nil)
+	namedStrategy := newNginxInstallStrategy(genName(prefixFunc("dep")), permissions, nil)
 	csvA := newCSV("nginx-a", namespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, namedStrategy)
 	csvB := newCSV("nginx-b", namespace, "nginx-a", semver.MustParse("0.2.0"), []apiextensions.CustomResourceDefinition{crd}, nil, namedStrategy)
 
@@ -235,7 +240,7 @@ func newCatalogSource(t *testing.T, kubeclient operatorclient.ClientInterface, c
 		},
 	}
 
-	catalogSourceName := genName("mock-nginx-")
+	catalogSourceName := genName(prefixFunc("catsrc"))
 	catsrc, cleanup = createInternalCatalogSource(t, kubeclient, crclient, catalogSourceName, namespace, manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csvA, csvB})
 	require.NotNil(t, catsrc)
 	require.NotNil(t, cleanup)