Merge pull request #599 from njhale/fix-tests

fix(e2e): fix CSV tests

Author: njhale

cmd/olm/main.go

@@ -34,7 +34,7 @@ var (
 		"interval", defaultWakeupInterval, "wake up interval")
 
 	watchedNamespaces = flag.String(
-		"watchedNamespaces", "", "comma separated list of namespaces for alm operator to watch. "+
+		"watchedNamespaces", "", "comma separated list of namespaces for olm operator to watch. "+
 			"If not set, or set to the empty string (e.g. `-watchedNamespaces=\"\"`), "+
 			"olm operator will watch all namespaces in the cluster.")
 
@@ -48,7 +48,7 @@ func init() {
 	metrics.Register()
 }
 
-// main function - entrypoint to ALM operator
+// main function - entrypoint to OLM operator
 func main() {
 	stopCh := signals.SetupSignalHandler()
 

test/e2e/catalog_e2e_test.go

@@ -54,7 +54,7 @@ func TestCatalogLoadingBetweenRestarts(t *testing.T) {
 	require.NoError(t, err)
 
 	// get catalog operator deployment
-	deployment, err := getOperatorDeployment(c, labels.Set{"app": "catalog-operator"})
+	deployment, err := getOperatorDeployment(c, operatorNamespace, labels.Set{"app": "catalog-operator"})
 	require.NoError(t, err)
 	require.NotNil(t, deployment, "Could not find catalog operator deployment")
 
@@ -77,8 +77,8 @@ func TestCatalogLoadingBetweenRestarts(t *testing.T) {
 	t.Logf("Catalog source sucessfully loaded after rescale")
 }
 
-func getOperatorDeployment(c operatorclient.ClientInterface, operatorLabels labels.Set) (*appsv1.Deployment, error) {
-	deployments, err := c.ListDeploymentsWithLabels(operatorNamespace, operatorLabels)
+func getOperatorDeployment(c operatorclient.ClientInterface, namespace string, operatorLabels labels.Set) (*appsv1.Deployment, error) {
+	deployments, err := c.ListDeploymentsWithLabels(namespace, operatorLabels)
 	if err != nil || deployments == nil || len(deployments.Items) != 1 {
 		return nil, fmt.Errorf("Error getting single operator deployment for label: %v", operatorLabels)
 	}
@@ -95,7 +95,7 @@ func rescaleDeployment(c operatorclient.ClientInterface, deployment *appsv1.Depl
 	}
 
 	waitForScaleup := func() (bool, error) {
-		fetchedDeployment, err := c.GetDeployment(operatorNamespace, deployment.GetName())
+		fetchedDeployment, err := c.GetDeployment(deployment.GetNamespace(), deployment.GetName())
 		if err != nil {
 			return true, err
 		}

test/e2e/csv_e2e_test.go

@@ -596,11 +596,16 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 		},
 	}
 
-	// Create dependency first (CRD)
+	// Create CSV first, knowing it will fail
+	cleanupCSV, err := createCSV(t, c, crc, csv, testNamespace, true, false)
+	require.NoError(t, err)
+	defer cleanupCSV()
+
+	fetchedCSV, err := fetchCSV(t, crc, csv.Name, csvPendingChecker)
+	require.NoError(t, err)
+
 	crd := extv1beta1.CustomResourceDefinition{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: crdName,
-		},
+		ObjectMeta: metav1.ObjectMeta{Name: crdName},
 		Spec: extv1beta1.CustomResourceDefinitionSpec{
 			Group:   "cluster.com",
 			Version: "v1alpha1",
@@ -613,6 +618,12 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 			Scope: "Namespaced",
 		},
 	}
+	crd.SetOwnerReferences([]metav1.OwnerReference{{
+		Name: fetchedCSV.GetName(),
+		APIVersion: v1alpha1.ClusterServiceVersionAPIVersion,
+		Kind: v1alpha1.ClusterServiceVersionKind,
+		UID: fetchedCSV.GetUID(),
+	}})
 	cleanupCRD, err := createCRD(c, crd)
 	require.NoError(t, err)
 
@@ -714,39 +725,12 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 	_, err = c.CreateClusterRoleBinding(&nonResourceClusterRoleBinding)
 	require.NoError(t, err, "could not create ClusterRoleBinding")
 
-	cleanupCSV, err := createCSV(t, c, crc, csv, testNamespace, true, false)
-	require.NoError(t, err)
-	defer cleanupCSV()
-
-	fmt.Println("checking for deployment")
-	// Poll for deployment to be ready
-	err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
-		dep, err := c.GetDeployment(testNamespace, depName)
-		if k8serrors.IsNotFound(err) {
-			fmt.Printf("deployment %s not found", depName)
-			return false, nil
-		} else if err != nil {
-			fmt.Printf("unexpected error fetching deployment %s", depName)
-			return false, err
-		}
-		if dep.Status.UpdatedReplicas == *(dep.Spec.Replicas) &&
-			dep.Status.Replicas == *(dep.Spec.Replicas) &&
-			dep.Status.AvailableReplicas == *(dep.Spec.Replicas) {
-			fmt.Printf("deployment ready")
-			return true, nil
-		}
-		fmt.Printf("deployment not ready")
-		return false, nil
-	})
-	require.NoError(t, err)
-
-	fetchedCSV, err := fetchCSV(t, crc, csv.Name, csvSucceededChecker)
+	// Wait for CSV success
+	_, err = fetchCSV(t, crc, csv.Name, csvSucceededChecker)
 	require.NoError(t, err)
 
-	// Fetch cluster service version again to check for unnecessary control loops
-	sameCSV, err := fetchCSV(t, crc, csv.Name, csvSucceededChecker)
+	fetchedCSV, err = fetchCSV(t, crc, csv.Name, csvSucceededChecker)
 	require.NoError(t, err)
-	compareResources(t, fetchedCSV, sameCSV)
 
 	// Delete CRD
 	cleanupCRD()
@@ -760,7 +744,7 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 	require.NoError(t, err)
 	defer cleanupCRD()
 
-	// Wait for CSV success
+	// Wait for CSV success again
 	fetchedCSV, err = fetchCSV(t, crc, csv.Name, csvSucceededChecker)
 	require.NoError(t, err)
 }
@@ -1009,12 +993,12 @@ func TestCreateCSVWithOwnedAPIService(t *testing.T) {
 	// Induce a cert rotation
 	fetchedCSV.Status.CertsLastUpdated = metav1.Now()
 	fetchedCSV.Status.CertsRotateAt = metav1.Now()
-	fetchedCSV, err = crc.OperatorsV1alpha1().ClusterServiceVersions(operatorNamespace).UpdateStatus(fetchedCSV)
+	fetchedCSV, err = crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).UpdateStatus(fetchedCSV)
 	require.NoError(t, err)
 
 	_, err = fetchCSV(t, crc, csv.Name, func(csv *v1alpha1.ClusterServiceVersion) bool {
 		// Should create deployment
-		dep, err = c.GetDeployment(operatorNamespace, depName)
+		dep, err = c.GetDeployment(testNamespace, depName)
 		require.NoError(t, err)
 
 		// Should have a new ca hash annotation

test/e2e/util_test.go

@@ -240,7 +240,7 @@ func catalogSourceSynced(catalog *v1alpha1.CatalogSource) bool {
 	if !catalog.Status.LastSync.IsZero() {
 		return true
 	}
-	fmt.Printf("not synced: %#v", catalog)
+
 	return false
 }