Merge pull request #833 from ecordell/fix-e2e

test(e2e): wait for deployment to exist in csv replacement test

Author: openshift-merge-robot

deploy/chart/templates/0000_50_olm_09-aggregated.clusterrole.yaml

@@ -25,5 +25,8 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
 - apiGroups: ["operators.coreos.com"]
-  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "packagemanifests"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: ["packages.operators.coreos.com"]
+  resources: ["packagemanifests"]
   verbs: ["get", "list", "watch"]

pkg/controller/operators/olm/operator.go

@@ -396,7 +396,14 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
 
 	defer func(csv v1alpha1.ClusterServiceVersion) {
 		logger.Debug("removing csv from queue set")
-		a.csvQueueSet.Remove(csv.GetName(), csv.GetNamespace())
+		if err := a.csvQueueSet.Remove(csv.GetName(), csv.GetNamespace()); err != nil {
+			logger.WithError(err).Debug("error removing from queue")
+		}
+
+		if clusterServiceVersion.IsCopied() {
+			logger.Debug("deleted csv is copied. skipping operatorgroup requeue")
+			return
+		}
 
 		// Requeue all OperatorGroups in the namespace
 		logger.Debug("requeueing operatorgroups in namespace")

test/e2e/csv_e2e_test.go

@@ -256,6 +256,19 @@ func awaitCSV(t *testing.T, c versioned.Interface, namespace, name string, check
 	return fetched, err
 }
 
+func waitForDeployment(t *testing.T, c operatorclient.ClientInterface, name string) error {
+	return wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+		_, err := c.GetDeployment(testNamespace, name)
+		if err != nil {
+			if k8serrors.IsNotFound(err) {
+				return false, nil
+			}
+			return false, err
+		}
+		return true, nil
+	})
+}
+
 func waitForDeploymentToDelete(t *testing.T, c operatorclient.ClientInterface, name string) error {
 	return wait.Poll(pollInterval, pollDuration, func() (bool, error) {
 		t.Logf("waiting for deployment %s to delete", name)
@@ -2687,6 +2700,10 @@ func TestUpdateCSVModifyDeploymentName(t *testing.T) {
 	_, err = crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Update(fetchedCSV)
 	require.NoError(t, err)
 
+	// Wait for new deployment to exist
+	err = waitForDeployment(t, c, strategyNew.DeploymentSpecs[0].Name)
+	require.NoError(t, err)
+
 	// Wait for updated CSV to succeed
 	_, err = fetchCSV(t, crc, csv.Name, testNamespace, csvSucceededChecker)
 	require.NoError(t, err)