update test cases

Signed-off-by: Daniel Fan <[email protected]>

common/Makefile.common.mk

@@ -21,7 +21,7 @@
 PROJECT ?= oceanic-guard-191815
 ZONE    ?= us-east5-c
 CLUSTER ?= bedrock-prow
-NAMESPACESCOPE_VERSION = 1.1.1
+NAMESPACESCOPE_VERSION = 1.17.3
 OLM_API_VERSION = 0.3.8
 
 activate-serviceaccount:
@@ -71,14 +71,14 @@ fetch-test-crds:
 	rm -rf api-${OLM_API_VERSION} v${OLM_API_VERSION}.tar.gz ;\
 	}
 	@{ \
-	curl -L -O "https://github.com/horis233/jenkins-operator/archive/v0.3.3.tar.gz" ;\
-	tar -zxf v0.3.3.tar.gz jenkins-operator-0.3.3/deploy/crds && mv jenkins-operator-0.3.3/deploy/crds/jenkins_v1alpha2_jenkins_crd.yaml ${ENVCRDS_DIR}/jenkins_v1alpha2_jenkins_crd.yaml ;\
-	rm -rf jenkins-operator-0.3.3 v0.3.3.tar.gz ;\
+	curl -L -O "https://github.com/mongodb/mongodb-atlas-kubernetes/archive/refs/tags/v1.7.3.tar.gz" ;\
+	tar -zxf v1.7.3.tar.gz mongodb-atlas-kubernetes-1.7.3/deploy/crds && mv mongodb-atlas-kubernetes-1.7.3/deploy/crds/* ${ENVCRDS_DIR} ;\
+	rm -rf mongodb-atlas-kubernetes-1.7.3 v1.7.3.tar.gz ;\
 	}
 	@{ \
-	curl -L -O "https://github.com/horis233/etcd-operator/archive/v0.9.4-crd.tar.gz" ;\
-	tar -zxf v0.9.4-crd.tar.gz etcd-operator-0.9.4-crd/deploy/crds && mv etcd-operator-0.9.4-crd/deploy/crds/etcdclusters.etcd.database.coreos.com.crd.yaml ${ENVCRDS_DIR}/etcdclusters.etcd.database.coreos.com.crd.yaml ;\
-	rm -rf etcd-operator-0.9.4-crd v0.9.4-crd.tar.gz ;\
+	curl -L -O "https://github.com/jaegertracing/jaeger-operator/archive/refs/tags/v1.36.0.tar.gz" ;\
+	tar -zxf v1.36.0.tar.gz jaeger-operator-1.36.0/bundle/manifests && mv jaeger-operator-1.36.0/bundle/manifests/jaegertracing.io_jaegers.yaml ${ENVCRDS_DIR}/jaegertracing.io_jaegers.yaml ;\
+	rm -rf jaeger-operator-1.36.0 v1.36.0.tar.gz ;\
 	}
 	@{ \
 	curl -L -O "https://github.com/IBM/ibm-namespace-scope-operator/archive/v${NAMESPACESCOPE_VERSION}.tar.gz" ;\

config/samples/operator_v1alpha1_operandconfig.yaml

@@ -8,12 +8,15 @@ metadata:
   name: example-service
 spec:
   services:
-  - name: etcd
+  - name: jaeger
     spec:
-      etcdCluster:
-        size: 1
-  - name: jenkins
+      jaeger:
+        strategy: allinone
+  - name: mongodb-atlas-kubernetes
     spec:
-      jenkins:
-        service:
-          port: 8081
+      atlasDeployment:
+          deploymentSpec:
+            name: test-deployment
+          projectRef:
+            name: my-project
+

config/samples/operator_v1alpha1_operandregistry.yaml

@@ -8,16 +8,16 @@ metadata:
   name: example-service
 spec:
   operators:
-  - name: etcd
-    namespace: etcd-cluster-operator
-    channel: clusterwide-alpha
+  - name: jaeger
+    namespace: default
+    channel: stable
     installMode: cluster
-    packageName: etcd
+    packageName: jaeger
     sourceName: community-operators
     sourceNamespace: openshift-marketplace
-  - name: jenkins
+  - name: mongodb-atlas-kubernetes
     namespace: default
-    channel: alpha
-    packageName: jenkins-operator
+    channel: stable
+    packageName: mongodb-atlas-kubernetes
     sourceName: community-operators
     sourceNamespace: openshift-marketplace

config/samples/operator_v1alpha1_operandrequest.yaml

@@ -10,5 +10,5 @@ spec:
   requests:
   - registry: example-service
     operands:
-    - name: etcd
-    - name: jenkins
+    - name: jaeger
+    - name: mongodb-atlas-kubernetes

controllers/namespacescope/namespacescope_suite_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
+	jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -64,9 +63,8 @@ var (
 func TestNamespaceScope(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"NamespaceScope Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t,
+		"NamespaceScope Controller Suite")
 }
 
 var _ = BeforeSuite(func(done Done) {
@@ -94,7 +92,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).NotTo(HaveOccurred())
 	err = olmv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
+	err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

controllers/operandbindinfo/operandbindinfo_suite_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
+	jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -63,9 +62,8 @@ var (
 func TestOperandBindInfo(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"OperandBindInfo Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t,
+		"OperandBindInfo Controller Suite")
 }
 
 var _ = BeforeSuite(func(done Done) {
@@ -92,7 +90,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).NotTo(HaveOccurred())
 	err = olmv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
+	err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

controllers/operandconfig/operandconfig_controller_test.go

@@ -106,52 +106,52 @@ var _ = Describe("OperandConfig controller", func() {
 			Expect(k8sClient.Create(ctx, request)).Should(Succeed())
 
 			By("Setting status of the Subscriptions")
-			etcdSub := testutil.Subscription("etcd", operatorNamespaceName)
+			jaegerSub := testutil.Subscription("jaeger", operatorNamespaceName)
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd", Namespace: operatorNamespaceName}, etcdSub)
-				etcdSub.Status = testutil.SubscriptionStatus("etcd", operatorNamespaceName, "0.0.1")
-				return k8sClient.Status().Update(ctx, etcdSub)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger", Namespace: operatorNamespaceName}, jaegerSub)
+				jaegerSub.Status = testutil.SubscriptionStatus("jaeger", operatorNamespaceName, "0.0.1")
+				return k8sClient.Status().Update(ctx, jaegerSub)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsSub := testutil.Subscription("jenkins", operatorNamespaceName)
+			mongodbSub := testutil.Subscription("mongodb-atlas-kubernetes", operatorNamespaceName)
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins", Namespace: operatorNamespaceName}, jenkinsSub)
-				jenkinsSub.Status = testutil.SubscriptionStatus("jenkins", operatorNamespaceName, "0.0.1")
-				return k8sClient.Status().Update(ctx, jenkinsSub)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes", Namespace: operatorNamespaceName}, mongodbSub)
+				mongodbSub.Status = testutil.SubscriptionStatus("mongodb-atlas-kubernetes", operatorNamespaceName, "0.0.1")
+				return k8sClient.Status().Update(ctx, mongodbSub)
 			}, timeout, interval).Should(Succeed())
 
 			By("Creating and Setting status of the ClusterServiceVersions")
-			etcdCSV := testutil.ClusterServiceVersion("etcd-csv.v0.0.1", operatorNamespaceName, testutil.EtcdExample)
-			Expect(k8sClient.Create(ctx, etcdCSV)).Should(Succeed())
+			jaegerCSV := testutil.ClusterServiceVersion("jaeger-csv.v0.0.1", operatorNamespaceName, testutil.JaegerExample)
+			Expect(k8sClient.Create(ctx, jaegerCSV)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-csv.v0.0.1", Namespace: operatorNamespaceName}, etcdCSV)
-				etcdCSV.Status = testutil.ClusterServiceVersionStatus()
-				return k8sClient.Status().Update(ctx, etcdCSV)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-csv.v0.0.1", Namespace: operatorNamespaceName}, jaegerCSV)
+				jaegerCSV.Status = testutil.ClusterServiceVersionStatus()
+				return k8sClient.Status().Update(ctx, jaegerCSV)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsCSV := testutil.ClusterServiceVersion("jenkins-csv.v0.0.1", operatorNamespaceName, testutil.JenkinsExample)
-			Expect(k8sClient.Create(ctx, jenkinsCSV)).Should(Succeed())
+			mongodbCSV := testutil.ClusterServiceVersion("mongodb-atlas-kubernetes-csv.v0.0.1", operatorNamespaceName, testutil.MongodbExample)
+			Expect(k8sClient.Create(ctx, mongodbCSV)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-csv.v0.0.1", Namespace: operatorNamespaceName}, jenkinsCSV)
-				jenkinsCSV.Status = testutil.ClusterServiceVersionStatus()
-				return k8sClient.Status().Update(ctx, jenkinsCSV)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-csv.v0.0.1", Namespace: operatorNamespaceName}, mongodbCSV)
+				mongodbCSV.Status = testutil.ClusterServiceVersionStatus()
+				return k8sClient.Status().Update(ctx, mongodbCSV)
 			}, timeout, interval).Should(Succeed())
 
 			By("Creating and Setting status of the InstallPlan")
-			etcdIP := testutil.InstallPlan("etcd-install-plan", operatorNamespaceName)
-			Expect(k8sClient.Create(ctx, etcdIP)).Should(Succeed())
+			jaegerIP := testutil.InstallPlan("jaeger-install-plan", operatorNamespaceName)
+			Expect(k8sClient.Create(ctx, jaegerIP)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-install-plan", Namespace: operatorNamespaceName}, etcdIP)
-				etcdIP.Status = testutil.InstallPlanStatus()
-				return k8sClient.Status().Update(ctx, etcdIP)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-install-plan", Namespace: operatorNamespaceName}, jaegerIP)
+				jaegerIP.Status = testutil.InstallPlanStatus()
+				return k8sClient.Status().Update(ctx, jaegerIP)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsIP := testutil.InstallPlan("jenkins-install-plan", operatorNamespaceName)
-			Expect(k8sClient.Create(ctx, jenkinsIP)).Should(Succeed())
+			mongodbIP := testutil.InstallPlan("mongodb-atlas-kubernetes-install-plan", operatorNamespaceName)
+			Expect(k8sClient.Create(ctx, mongodbIP)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-install-plan", Namespace: operatorNamespaceName}, jenkinsIP)
-				jenkinsIP.Status = testutil.InstallPlanStatus()
-				return k8sClient.Status().Update(ctx, jenkinsIP)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-install-plan", Namespace: operatorNamespaceName}, mongodbIP)
+				mongodbIP.Status = testutil.InstallPlanStatus()
+				return k8sClient.Status().Update(ctx, mongodbIP)
 			}, timeout, interval).Should(Succeed())
 
 			By("Checking status of the OperandConfig")
@@ -162,12 +162,12 @@ var _ = Describe("OperandConfig controller", func() {
 			}, timeout, interval).Should(Equal(operatorv1alpha1.ServiceRunning))
 
 			By("Cleaning up olm resources")
-			Expect(k8sClient.Delete(ctx, etcdSub)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsSub)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, etcdCSV)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsCSV)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, etcdIP)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsIP)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerSub)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbSub)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerCSV)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbCSV)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerIP)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbIP)).Should(Succeed())
 		})
 	})
 })

controllers/operandconfig/operandconfig_suite_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
+	jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -64,9 +63,8 @@ var (
 func TestOperandConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"OperandConfig Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t,
+		"OperandConfig Controller Suite")
 }
 
 var _ = BeforeSuite(func(done Done) {
@@ -93,7 +91,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).NotTo(HaveOccurred())
 	err = olmv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
+	err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

controllers/operandregistry/operandregistry_controller_test.go

@@ -105,52 +105,52 @@ var _ = Describe("OperandRegistry controller", func() {
 			Expect(k8sClient.Create(ctx, request)).Should(Succeed())
 
 			By("Setting status of the Subscriptions")
-			etcdSub := testutil.Subscription("etcd", operatorNamespaceName)
+			jaegerSub := testutil.Subscription("jaeger", operatorNamespaceName)
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd", Namespace: operatorNamespaceName}, etcdSub)
-				etcdSub.Status = testutil.SubscriptionStatus("etcd", operatorNamespaceName, "0.0.1")
-				return k8sClient.Status().Update(ctx, etcdSub)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger", Namespace: operatorNamespaceName}, jaegerSub)
+				jaegerSub.Status = testutil.SubscriptionStatus("jaeger", operatorNamespaceName, "0.0.1")
+				return k8sClient.Status().Update(ctx, jaegerSub)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsSub := testutil.Subscription("jenkins", operatorNamespaceName)
+			mongodbSub := testutil.Subscription("mongodb-atlas-kubernetes", operatorNamespaceName)
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins", Namespace: operatorNamespaceName}, jenkinsSub)
-				jenkinsSub.Status = testutil.SubscriptionStatus("jenkins", operatorNamespaceName, "0.0.1")
-				return k8sClient.Status().Update(ctx, jenkinsSub)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes", Namespace: operatorNamespaceName}, mongodbSub)
+				mongodbSub.Status = testutil.SubscriptionStatus("mongodb-atlas-kubernetes", operatorNamespaceName, "0.0.1")
+				return k8sClient.Status().Update(ctx, mongodbSub)
 			}, timeout, interval).Should(Succeed())
 
 			By("Creating and Setting status of the ClusterServiceVersions")
-			etcdCSV := testutil.ClusterServiceVersion("etcd-csv.v0.0.1", operatorNamespaceName, testutil.EtcdExample)
-			Expect(k8sClient.Create(ctx, etcdCSV)).Should(Succeed())
+			jaegerCSV := testutil.ClusterServiceVersion("jaeger-csv.v0.0.1", operatorNamespaceName, testutil.JaegerExample)
+			Expect(k8sClient.Create(ctx, jaegerCSV)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-csv.v0.0.1", Namespace: operatorNamespaceName}, etcdCSV)
-				etcdCSV.Status = testutil.ClusterServiceVersionStatus()
-				return k8sClient.Status().Update(ctx, etcdCSV)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-csv.v0.0.1", Namespace: operatorNamespaceName}, jaegerCSV)
+				jaegerCSV.Status = testutil.ClusterServiceVersionStatus()
+				return k8sClient.Status().Update(ctx, jaegerCSV)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsCSV := testutil.ClusterServiceVersion("jenkins-csv.v0.0.1", operatorNamespaceName, testutil.JenkinsExample)
-			Expect(k8sClient.Create(ctx, jenkinsCSV)).Should(Succeed())
+			mongodbCSV := testutil.ClusterServiceVersion("mongodb-atlas-kubernetes-csv.v0.0.1", operatorNamespaceName, testutil.MongodbExample)
+			Expect(k8sClient.Create(ctx, mongodbCSV)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-csv.v0.0.1", Namespace: operatorNamespaceName}, jenkinsCSV)
-				jenkinsCSV.Status = testutil.ClusterServiceVersionStatus()
-				return k8sClient.Status().Update(ctx, jenkinsCSV)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-csv.v0.0.1", Namespace: operatorNamespaceName}, mongodbCSV)
+				mongodbCSV.Status = testutil.ClusterServiceVersionStatus()
+				return k8sClient.Status().Update(ctx, mongodbCSV)
 			}, timeout, interval).Should(Succeed())
 
 			By("Creating and Setting status of the InstallPlan")
-			etcdIP := testutil.InstallPlan("etcd-install-plan", operatorNamespaceName)
-			Expect(k8sClient.Create(ctx, etcdIP)).Should(Succeed())
+			jaegerIP := testutil.InstallPlan("jaeger-install-plan", operatorNamespaceName)
+			Expect(k8sClient.Create(ctx, jaegerIP)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-install-plan", Namespace: operatorNamespaceName}, etcdIP)
-				etcdIP.Status = testutil.InstallPlanStatus()
-				return k8sClient.Status().Update(ctx, etcdIP)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-install-plan", Namespace: operatorNamespaceName}, jaegerIP)
+				jaegerIP.Status = testutil.InstallPlanStatus()
+				return k8sClient.Status().Update(ctx, jaegerIP)
 			}, timeout, interval).Should(Succeed())
 
-			jenkinsIP := testutil.InstallPlan("jenkins-install-plan", operatorNamespaceName)
-			Expect(k8sClient.Create(ctx, jenkinsIP)).Should(Succeed())
+			mongodbIP := testutil.InstallPlan("mongodb-atlas-kubernetes-install-plan", operatorNamespaceName)
+			Expect(k8sClient.Create(ctx, mongodbIP)).Should(Succeed())
 			Eventually(func() error {
-				k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-install-plan", Namespace: operatorNamespaceName}, jenkinsIP)
-				jenkinsIP.Status = testutil.InstallPlanStatus()
-				return k8sClient.Status().Update(ctx, jenkinsIP)
+				k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-install-plan", Namespace: operatorNamespaceName}, mongodbIP)
+				mongodbIP.Status = testutil.InstallPlanStatus()
+				return k8sClient.Status().Update(ctx, mongodbIP)
 			}, timeout, interval).Should(Succeed())
 
 			By("Checking status of the OperandRegistry")
@@ -161,12 +161,12 @@ var _ = Describe("OperandRegistry controller", func() {
 			}, timeout, interval).Should(Equal(operatorv1alpha1.RegistryRunning))
 
 			By("Cleaning up olm resources")
-			Expect(k8sClient.Delete(ctx, etcdSub)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsSub)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, etcdCSV)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsCSV)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, etcdIP)).Should(Succeed())
-			Expect(k8sClient.Delete(ctx, jenkinsIP)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerSub)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbSub)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerCSV)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbCSV)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, jaegerIP)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, mongodbIP)).Should(Succeed())
 		})
 	})
 })