Remove test-operator.v2.0.0 fixture

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

test/e2e/cluster_extension_install_test.go

@@ -401,6 +401,12 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
 				var np networkingv1.NetworkPolicy
 				assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: "test-operator-network-policy", Namespace: ns.Name}, &np))
 			}, pollDuration, pollInterval)
+
+			t.Log("By verifying that no templating occurs for registry+v1 bundle manifests")
+			cm := corev1.ConfigMap{}
+			require.NoError(t, c.Get(context.Background(), types.NamespacedName{Namespace: ns.Name, Name: "test-configmap"}, &cm))
+			require.Contains(t, cm.Annotations, "shouldNotTemplate")
+			require.Contains(t, cm.Annotations["shouldNotTemplate"], "{{ $labels.namespace }}")
 		})
 	}
 }
@@ -756,15 +762,9 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
 			assert.Equal(ct, metav1.ConditionTrue, cond.Status)
 			assert.Equal(ct, ocv1.ReasonSucceeded, cond.Reason)
 			assert.Contains(ct, cond.Message, "Installed bundle")
-			assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "2.0.0")
+			assert.Contains(ct, clusterExtension.Status.Install.Bundle.Version, "1.3.0")
 		}
 	}, pollDuration, pollInterval)
-
-	t.Log("By verifying that no templating occurs for registry+v1 bundle manifests")
-	cm := corev1.ConfigMap{}
-	require.NoError(t, c.Get(context.Background(), types.NamespacedName{Namespace: ns.Name, Name: "test-configmap"}, &cm))
-	require.Contains(t, cm.Annotations, "shouldNotTemplate")
-	require.Contains(t, cm.Annotations["shouldNotTemplate"], "{{ $labels.namespace }}")
 }
 
 func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {

testdata/images/bundles/test-operator/v1.0.0/manifests/bundle.configmap.yaml

@@ -2,6 +2,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: test-configmap
+  annotations:
+    shouldNotTemplate: >
+      The namespace is {{ $labels.namespace }}. The templated
+      $labels.namespace is NOT expected to be processed by OLM's
+      rendering engine for registry+v1 bundles.
 data:
   version: "v1.0.0"
   name: "test-configmap"

testdata/images/bundles/test-operator/v2.0.0/manifests/bundle.configmap.yaml

@@ -7,15 +7,15 @@ schema: olm.channel
 name: beta
 package: test
 entries:
-  - name: test-operator.2.0.0
+  - name: test-operator.1.3.0
     replaces: test-operator.1.2.0
 ---
 schema: olm.bundle
-name: test-operator.2.0.0
+name: test-operator.1.3.0
 package: test
-image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/test-operator:v2.0.0
+image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/test-operator:v1.0.0
 properties:
   - type: olm.package
     value:
       packageName: test
-      version: 2.0.0
+      version: 1.3.0