Skip to content

Commit edf928e

Browse files
Daniel-FanDaniel-Fan
committed
update test cases
Signed-off-by: Daniel Fan <[email protected]>
1 parent 6febe70 commit edf928e

21 files changed

+966
-541
lines changed

‎common/Makefile.common.mk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
PROJECT ?= oceanic-guard-191815
2222
ZONE ?= us-east5-c
2323
CLUSTER ?= bedrock-prow
24-
NAMESPACESCOPE_VERSION = 1.1.1
24+
NAMESPACESCOPE_VERSION = 1.17.3
2525
OLM_API_VERSION = 0.3.8
2626

2727
activate-serviceaccount:
@@ -71,14 +71,14 @@ fetch-test-crds:
7171
rm -rf api-${OLM_API_VERSION} v${OLM_API_VERSION}.tar.gz ;\
7272
}
7373
@{ \
74-
curl -L -O "https://github.com/horis233/jenkins-operator/archive/v0.3.3.tar.gz" ;\
75-
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 ;\
76-
rm -rf jenkins-operator-0.3.3 v0.3.3.tar.gz ;\
74+
curl -L -O "https://github.com/mongodb/mongodb-atlas-kubernetes/archive/refs/tags/v1.7.3.tar.gz" ;\
75+
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} ;\
76+
rm -rf mongodb-atlas-kubernetes-1.7.3 v1.7.3.tar.gz ;\
7777
}
7878
@{ \
79-
curl -L -O "https://github.com/horis233/etcd-operator/archive/v0.9.4-crd.tar.gz" ;\
80-
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 ;\
81-
rm -rf etcd-operator-0.9.4-crd v0.9.4-crd.tar.gz ;\
79+
curl -L -O "https://github.com/jaegertracing/jaeger-operator/archive/refs/tags/v1.36.0.tar.gz" ;\
80+
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 ;\
81+
rm -rf jaeger-operator-1.36.0 v1.36.0.tar.gz ;\
8282
}
8383
@{ \
8484
curl -L -O "https://github.com/IBM/ibm-namespace-scope-operator/archive/v${NAMESPACESCOPE_VERSION}.tar.gz" ;\

‎config/samples/operator_v1alpha1_operandconfig.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ metadata:
88
name: example-service
99
spec:
1010
services:
11-
- name: etcd
11+
- name: jaeger
1212
spec:
13-
etcdCluster:
14-
size: 1
15-
- name: jenkins
13+
jaeger:
14+
strategy: allinone
15+
- name: mongodb-atlas-kubernetes
1616
spec:
17-
jenkins:
18-
service:
19-
port: 8081
17+
atlasDeployment:
18+
deploymentSpec:
19+
name: test-deployment
20+
projectRef:
21+
name: my-project
22+

‎config/samples/operator_v1alpha1_operandregistry.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ metadata:
88
name: example-service
99
spec:
1010
operators:
11-
- name: etcd
12-
namespace: etcd-cluster-operator
13-
channel: clusterwide-alpha
11+
- name: jaeger
12+
namespace: default
13+
channel: stable
1414
installMode: cluster
15-
packageName: etcd
15+
packageName: jaeger
1616
sourceName: community-operators
1717
sourceNamespace: openshift-marketplace
18-
- name: jenkins
18+
- name: mongodb-atlas-kubernetes
1919
namespace: default
20-
channel: alpha
21-
packageName: jenkins-operator
20+
channel: stable
21+
packageName: mongodb-atlas-kubernetes
2222
sourceName: community-operators
2323
sourceNamespace: openshift-marketplace

‎config/samples/operator_v1alpha1_operandrequest.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
requests:
1111
- registry: example-service
1212
operands:
13-
- name: etcd
14-
- name: jenkins
13+
- name: jaeger
14+
- name: mongodb-atlas-kubernetes

‎controllers/namespacescope/namespacescope_suite_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
25+
jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
2626
. "github.com/onsi/ginkgo"
2727
. "github.com/onsi/gomega"
2828
"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/envtest"
36-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3736
logf "sigs.k8s.io/controller-runtime/pkg/log"
3837
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3938

@@ -64,9 +63,8 @@ var (
6463
func TestNamespaceScope(t *testing.T) {
6564
RegisterFailHandler(Fail)
6665

67-
RunSpecsWithDefaultAndCustomReporters(t,
68-
"NamespaceScope Controller Suite",
69-
[]Reporter{printer.NewlineReporter{}})
66+
RunSpecs(t,
67+
"NamespaceScope Controller Suite")
7068
}
7169

7270
var _ = BeforeSuite(func(done Done) {
@@ -94,7 +92,7 @@ var _ = BeforeSuite(func(done Done) {
9492
Expect(err).NotTo(HaveOccurred())
9593
err = olmv1.AddToScheme(clientgoscheme.Scheme)
9694
Expect(err).NotTo(HaveOccurred())
97-
err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
95+
err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
9896
Expect(err).NotTo(HaveOccurred())
9997

10098
k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

‎controllers/operandbindinfo/operandbindinfo_suite_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
25+
jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
2626
. "github.com/onsi/ginkgo"
2727
. "github.com/onsi/gomega"
2828
"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/envtest"
36-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3736
logf "sigs.k8s.io/controller-runtime/pkg/log"
3837
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3938

@@ -63,9 +62,8 @@ var (
6362
func TestOperandBindInfo(t *testing.T) {
6463
RegisterFailHandler(Fail)
6564

66-
RunSpecsWithDefaultAndCustomReporters(t,
67-
"OperandBindInfo Controller Suite",
68-
[]Reporter{printer.NewlineReporter{}})
65+
RunSpecs(t,
66+
"OperandBindInfo Controller Suite")
6967
}
7068

7169
var _ = BeforeSuite(func(done Done) {
@@ -92,7 +90,7 @@ var _ = BeforeSuite(func(done Done) {
9290
Expect(err).NotTo(HaveOccurred())
9391
err = olmv1.AddToScheme(clientgoscheme.Scheme)
9492
Expect(err).NotTo(HaveOccurred())
95-
err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
93+
err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
9694
Expect(err).NotTo(HaveOccurred())
9795

9896
k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

‎controllers/operandconfig/operandconfig_controller_test.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -106,52 +106,52 @@ var _ = Describe("OperandConfig controller", func() {
106106
Expect(k8sClient.Create(ctx, request)).Should(Succeed())
107107

108108
By("Setting status of the Subscriptions")
109-
etcdSub := testutil.Subscription("etcd", operatorNamespaceName)
109+
jaegerSub := testutil.Subscription("jaeger", operatorNamespaceName)
110110
Eventually(func() error {
111-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd", Namespace: operatorNamespaceName}, etcdSub)
112-
etcdSub.Status = testutil.SubscriptionStatus("etcd", operatorNamespaceName, "0.0.1")
113-
return k8sClient.Status().Update(ctx, etcdSub)
111+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger", Namespace: operatorNamespaceName}, jaegerSub)
112+
jaegerSub.Status = testutil.SubscriptionStatus("jaeger", operatorNamespaceName, "0.0.1")
113+
return k8sClient.Status().Update(ctx, jaegerSub)
114114
}, timeout, interval).Should(Succeed())
115115

116-
jenkinsSub := testutil.Subscription("jenkins", operatorNamespaceName)
116+
mongodbSub := testutil.Subscription("mongodb-atlas-kubernetes", operatorNamespaceName)
117117
Eventually(func() error {
118-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins", Namespace: operatorNamespaceName}, jenkinsSub)
119-
jenkinsSub.Status = testutil.SubscriptionStatus("jenkins", operatorNamespaceName, "0.0.1")
120-
return k8sClient.Status().Update(ctx, jenkinsSub)
118+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes", Namespace: operatorNamespaceName}, mongodbSub)
119+
mongodbSub.Status = testutil.SubscriptionStatus("mongodb-atlas-kubernetes", operatorNamespaceName, "0.0.1")
120+
return k8sClient.Status().Update(ctx, mongodbSub)
121121
}, timeout, interval).Should(Succeed())
122122

123123
By("Creating and Setting status of the ClusterServiceVersions")
124-
etcdCSV := testutil.ClusterServiceVersion("etcd-csv.v0.0.1", operatorNamespaceName, testutil.EtcdExample)
125-
Expect(k8sClient.Create(ctx, etcdCSV)).Should(Succeed())
124+
jaegerCSV := testutil.ClusterServiceVersion("jaeger-csv.v0.0.1", operatorNamespaceName, testutil.JaegerExample)
125+
Expect(k8sClient.Create(ctx, jaegerCSV)).Should(Succeed())
126126
Eventually(func() error {
127-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-csv.v0.0.1", Namespace: operatorNamespaceName}, etcdCSV)
128-
etcdCSV.Status = testutil.ClusterServiceVersionStatus()
129-
return k8sClient.Status().Update(ctx, etcdCSV)
127+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-csv.v0.0.1", Namespace: operatorNamespaceName}, jaegerCSV)
128+
jaegerCSV.Status = testutil.ClusterServiceVersionStatus()
129+
return k8sClient.Status().Update(ctx, jaegerCSV)
130130
}, timeout, interval).Should(Succeed())
131131

132-
jenkinsCSV := testutil.ClusterServiceVersion("jenkins-csv.v0.0.1", operatorNamespaceName, testutil.JenkinsExample)
133-
Expect(k8sClient.Create(ctx, jenkinsCSV)).Should(Succeed())
132+
mongodbCSV := testutil.ClusterServiceVersion("mongodb-atlas-kubernetes-csv.v0.0.1", operatorNamespaceName, testutil.MongodbExample)
133+
Expect(k8sClient.Create(ctx, mongodbCSV)).Should(Succeed())
134134
Eventually(func() error {
135-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-csv.v0.0.1", Namespace: operatorNamespaceName}, jenkinsCSV)
136-
jenkinsCSV.Status = testutil.ClusterServiceVersionStatus()
137-
return k8sClient.Status().Update(ctx, jenkinsCSV)
135+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-csv.v0.0.1", Namespace: operatorNamespaceName}, mongodbCSV)
136+
mongodbCSV.Status = testutil.ClusterServiceVersionStatus()
137+
return k8sClient.Status().Update(ctx, mongodbCSV)
138138
}, timeout, interval).Should(Succeed())
139139

140140
By("Creating and Setting status of the InstallPlan")
141-
etcdIP := testutil.InstallPlan("etcd-install-plan", operatorNamespaceName)
142-
Expect(k8sClient.Create(ctx, etcdIP)).Should(Succeed())
141+
jaegerIP := testutil.InstallPlan("jaeger-install-plan", operatorNamespaceName)
142+
Expect(k8sClient.Create(ctx, jaegerIP)).Should(Succeed())
143143
Eventually(func() error {
144-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-install-plan", Namespace: operatorNamespaceName}, etcdIP)
145-
etcdIP.Status = testutil.InstallPlanStatus()
146-
return k8sClient.Status().Update(ctx, etcdIP)
144+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-install-plan", Namespace: operatorNamespaceName}, jaegerIP)
145+
jaegerIP.Status = testutil.InstallPlanStatus()
146+
return k8sClient.Status().Update(ctx, jaegerIP)
147147
}, timeout, interval).Should(Succeed())
148148

149-
jenkinsIP := testutil.InstallPlan("jenkins-install-plan", operatorNamespaceName)
150-
Expect(k8sClient.Create(ctx, jenkinsIP)).Should(Succeed())
149+
mongodbIP := testutil.InstallPlan("mongodb-install-plan", operatorNamespaceName)
150+
Expect(k8sClient.Create(ctx, mongodbIP)).Should(Succeed())
151151
Eventually(func() error {
152-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-install-plan", Namespace: operatorNamespaceName}, jenkinsIP)
153-
jenkinsIP.Status = testutil.InstallPlanStatus()
154-
return k8sClient.Status().Update(ctx, jenkinsIP)
152+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-install-plan", Namespace: operatorNamespaceName}, mongodbIP)
153+
mongodbIP.Status = testutil.InstallPlanStatus()
154+
return k8sClient.Status().Update(ctx, mongodbIP)
155155
}, timeout, interval).Should(Succeed())
156156

157157
By("Checking status of the OperandConfig")
@@ -162,12 +162,12 @@ var _ = Describe("OperandConfig controller", func() {
162162
}, timeout, interval).Should(Equal(operatorv1alpha1.ServiceRunning))
163163

164164
By("Cleaning up olm resources")
165-
Expect(k8sClient.Delete(ctx, etcdSub)).Should(Succeed())
166-
Expect(k8sClient.Delete(ctx, jenkinsSub)).Should(Succeed())
167-
Expect(k8sClient.Delete(ctx, etcdCSV)).Should(Succeed())
168-
Expect(k8sClient.Delete(ctx, jenkinsCSV)).Should(Succeed())
169-
Expect(k8sClient.Delete(ctx, etcdIP)).Should(Succeed())
170-
Expect(k8sClient.Delete(ctx, jenkinsIP)).Should(Succeed())
165+
Expect(k8sClient.Delete(ctx, jaegerSub)).Should(Succeed())
166+
Expect(k8sClient.Delete(ctx, mongodbSub)).Should(Succeed())
167+
Expect(k8sClient.Delete(ctx, jaegerCSV)).Should(Succeed())
168+
Expect(k8sClient.Delete(ctx, mongodbCSV)).Should(Succeed())
169+
Expect(k8sClient.Delete(ctx, jaegerIP)).Should(Succeed())
170+
Expect(k8sClient.Delete(ctx, mongodbIP)).Should(Succeed())
171171
})
172172
})
173173
})

‎controllers/operandconfig/operandconfig_suite_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
etcdv1beta2 "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
25+
jaegerv1 "github.com/jaegertracing/jaeger-operator/apis/v1"
2626
. "github.com/onsi/ginkgo"
2727
. "github.com/onsi/gomega"
2828
"github.com/onsi/gomega/gexec"
@@ -33,7 +33,6 @@ import (
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/envtest"
36-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3736
logf "sigs.k8s.io/controller-runtime/pkg/log"
3837
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3938

@@ -64,9 +63,8 @@ var (
6463
func TestOperandConfig(t *testing.T) {
6564
RegisterFailHandler(Fail)
6665

67-
RunSpecsWithDefaultAndCustomReporters(t,
68-
"OperandConfig Controller Suite",
69-
[]Reporter{printer.NewlineReporter{}})
66+
RunSpecs(t,
67+
"OperandConfig Controller Suite")
7068
}
7169

7270
var _ = BeforeSuite(func(done Done) {
@@ -93,7 +91,7 @@ var _ = BeforeSuite(func(done Done) {
9391
Expect(err).NotTo(HaveOccurred())
9492
err = olmv1.AddToScheme(clientgoscheme.Scheme)
9593
Expect(err).NotTo(HaveOccurred())
96-
err = etcdv1beta2.AddToScheme(clientgoscheme.Scheme)
94+
err = jaegerv1.AddToScheme(clientgoscheme.Scheme)
9795
Expect(err).NotTo(HaveOccurred())
9896

9997
k8sClient, err = client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})

‎controllers/operandregistry/operandregistry_controller_test.go‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -105,52 +105,52 @@ var _ = Describe("OperandRegistry controller", func() {
105105
Expect(k8sClient.Create(ctx, request)).Should(Succeed())
106106

107107
By("Setting status of the Subscriptions")
108-
etcdSub := testutil.Subscription("etcd", operatorNamespaceName)
108+
jaegerSub := testutil.Subscription("jaeger", operatorNamespaceName)
109109
Eventually(func() error {
110-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd", Namespace: operatorNamespaceName}, etcdSub)
111-
etcdSub.Status = testutil.SubscriptionStatus("etcd", operatorNamespaceName, "0.0.1")
112-
return k8sClient.Status().Update(ctx, etcdSub)
110+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger", Namespace: operatorNamespaceName}, jaegerSub)
111+
jaegerSub.Status = testutil.SubscriptionStatus("jaeger", operatorNamespaceName, "0.0.1")
112+
return k8sClient.Status().Update(ctx, jaegerSub)
113113
}, timeout, interval).Should(Succeed())
114114

115-
jenkinsSub := testutil.Subscription("jenkins", operatorNamespaceName)
115+
mongodbSub := testutil.Subscription("mongodb-atlas-kubernetes", operatorNamespaceName)
116116
Eventually(func() error {
117-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins", Namespace: operatorNamespaceName}, jenkinsSub)
118-
jenkinsSub.Status = testutil.SubscriptionStatus("jenkins", operatorNamespaceName, "0.0.1")
119-
return k8sClient.Status().Update(ctx, jenkinsSub)
117+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes", Namespace: operatorNamespaceName}, mongodbSub)
118+
mongodbSub.Status = testutil.SubscriptionStatus("mongodb-atlas-kubernetes", operatorNamespaceName, "0.0.1")
119+
return k8sClient.Status().Update(ctx, mongodbSub)
120120
}, timeout, interval).Should(Succeed())
121121

122122
By("Creating and Setting status of the ClusterServiceVersions")
123-
etcdCSV := testutil.ClusterServiceVersion("etcd-csv.v0.0.1", operatorNamespaceName, testutil.EtcdExample)
124-
Expect(k8sClient.Create(ctx, etcdCSV)).Should(Succeed())
123+
jaegerCSV := testutil.ClusterServiceVersion("jaeger-csv.v0.0.1", operatorNamespaceName, testutil.JaegerExample)
124+
Expect(k8sClient.Create(ctx, jaegerCSV)).Should(Succeed())
125125
Eventually(func() error {
126-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-csv.v0.0.1", Namespace: operatorNamespaceName}, etcdCSV)
127-
etcdCSV.Status = testutil.ClusterServiceVersionStatus()
128-
return k8sClient.Status().Update(ctx, etcdCSV)
126+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-csv.v0.0.1", Namespace: operatorNamespaceName}, jaegerCSV)
127+
jaegerCSV.Status = testutil.ClusterServiceVersionStatus()
128+
return k8sClient.Status().Update(ctx, jaegerCSV)
129129
}, timeout, interval).Should(Succeed())
130130

131-
jenkinsCSV := testutil.ClusterServiceVersion("jenkins-csv.v0.0.1", operatorNamespaceName, testutil.JenkinsExample)
132-
Expect(k8sClient.Create(ctx, jenkinsCSV)).Should(Succeed())
131+
mongodbCSV := testutil.ClusterServiceVersion("mongodb-atlas-kubernetes-csv.v0.0.1", operatorNamespaceName, testutil.MongodbExample)
132+
Expect(k8sClient.Create(ctx, mongodbCSV)).Should(Succeed())
133133
Eventually(func() error {
134-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-csv.v0.0.1", Namespace: operatorNamespaceName}, jenkinsCSV)
135-
jenkinsCSV.Status = testutil.ClusterServiceVersionStatus()
136-
return k8sClient.Status().Update(ctx, jenkinsCSV)
134+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-atlas-kubernetes-csv.v0.0.1", Namespace: operatorNamespaceName}, mongodbCSV)
135+
mongodbCSV.Status = testutil.ClusterServiceVersionStatus()
136+
return k8sClient.Status().Update(ctx, mongodbCSV)
137137
}, timeout, interval).Should(Succeed())
138138

139139
By("Creating and Setting status of the InstallPlan")
140-
etcdIP := testutil.InstallPlan("etcd-install-plan", operatorNamespaceName)
141-
Expect(k8sClient.Create(ctx, etcdIP)).Should(Succeed())
140+
jaegerIP := testutil.InstallPlan("jaeger-install-plan", operatorNamespaceName)
141+
Expect(k8sClient.Create(ctx, jaegerIP)).Should(Succeed())
142142
Eventually(func() error {
143-
k8sClient.Get(ctx, types.NamespacedName{Name: "etcd-install-plan", Namespace: operatorNamespaceName}, etcdIP)
144-
etcdIP.Status = testutil.InstallPlanStatus()
145-
return k8sClient.Status().Update(ctx, etcdIP)
143+
k8sClient.Get(ctx, types.NamespacedName{Name: "jaeger-install-plan", Namespace: operatorNamespaceName}, jaegerIP)
144+
jaegerIP.Status = testutil.InstallPlanStatus()
145+
return k8sClient.Status().Update(ctx, jaegerIP)
146146
}, timeout, interval).Should(Succeed())
147147

148-
jenkinsIP := testutil.InstallPlan("jenkins-install-plan", operatorNamespaceName)
149-
Expect(k8sClient.Create(ctx, jenkinsIP)).Should(Succeed())
148+
mongodbIP := testutil.InstallPlan("mongodb-install-plan", operatorNamespaceName)
149+
Expect(k8sClient.Create(ctx, mongodbIP)).Should(Succeed())
150150
Eventually(func() error {
151-
k8sClient.Get(ctx, types.NamespacedName{Name: "jenkins-install-plan", Namespace: operatorNamespaceName}, jenkinsIP)
152-
jenkinsIP.Status = testutil.InstallPlanStatus()
153-
return k8sClient.Status().Update(ctx, jenkinsIP)
151+
k8sClient.Get(ctx, types.NamespacedName{Name: "mongodb-install-plan", Namespace: operatorNamespaceName}, mongodbIP)
152+
mongodbIP.Status = testutil.InstallPlanStatus()
153+
return k8sClient.Status().Update(ctx, mongodbIP)
154154
}, timeout, interval).Should(Succeed())
155155

156156
By("Checking status of the OperandRegistry")
@@ -161,12 +161,12 @@ var _ = Describe("OperandRegistry controller", func() {
161161
}, timeout, interval).Should(Equal(operatorv1alpha1.RegistryRunning))
162162

163163
By("Cleaning up olm resources")
164-
Expect(k8sClient.Delete(ctx, etcdSub)).Should(Succeed())
165-
Expect(k8sClient.Delete(ctx, jenkinsSub)).Should(Succeed())
166-
Expect(k8sClient.Delete(ctx, etcdCSV)).Should(Succeed())
167-
Expect(k8sClient.Delete(ctx, jenkinsCSV)).Should(Succeed())
168-
Expect(k8sClient.Delete(ctx, etcdIP)).Should(Succeed())
169-
Expect(k8sClient.Delete(ctx, jenkinsIP)).Should(Succeed())
164+
Expect(k8sClient.Delete(ctx, jaegerSub)).Should(Succeed())
165+
Expect(k8sClient.Delete(ctx, mongodbSub)).Should(Succeed())
166+
Expect(k8sClient.Delete(ctx, jaegerCSV)).Should(Succeed())
167+
Expect(k8sClient.Delete(ctx, mongodbCSV)).Should(Succeed())
168+
Expect(k8sClient.Delete(ctx, jaegerIP)).Should(Succeed())
169+
Expect(k8sClient.Delete(ctx, mongodbIP)).Should(Succeed())
170170
})
171171
})
172172
})

0 commit comments

Comments
 (0)