Skip to content

Commit 75b9e03

Browse files
harishsurfharishsurf
committed
Converted packagemanifest_e2e to ginkgo test
1 parent 6544650 commit 75b9e03

12 files changed

+449
-420
lines changed

‎test/e2e/catalog_e2e_test.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ var _ = Describe("Catalog", func() {
5252
namedStrategy := newNginxInstallStrategy(genName("dep-"), nil, nil)
5353
csv := newCSV(packageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, namedStrategy)
5454

55-
c := newKubeClient(GinkgoT())
56-
crc := newCRClient(GinkgoT())
55+
c := newKubeClient()
56+
crc := newCRClient()
5757

5858
catalogSourceName := genName("mock-ocs-")
59-
_, cleanupSource := createInternalCatalogSource(GinkgoT(), c, crc, catalogSourceName, operatorNamespace, manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
59+
_, cleanupSource := createInternalCatalogSource(c, crc, catalogSourceName, operatorNamespace, manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
6060
defer cleanupSource()
6161

6262
// ensure the mock catalog exists and has been synced by the catalog operator
63-
catalogSource, err := fetchCatalogSource(GinkgoT(), crc, catalogSourceName, operatorNamespace, catalogSourceRegistryPodSynced)
63+
catalogSource, err := fetchCatalogSource(crc, catalogSourceName, operatorNamespace, catalogSourceRegistryPodSynced)
6464
require.NoError(GinkgoT(), err)
6565

6666
// get catalog operator deployment
@@ -74,7 +74,7 @@ var _ = Describe("Catalog", func() {
7474
GinkgoT().Log("Catalog operator rescaled")
7575
GinkgoT( // check for last synced update to catalogsource
7676
).Log("Checking for catalogsource lastSync updates")
77-
_, err = fetchCatalogSource(GinkgoT(), crc, catalogSourceName, operatorNamespace, func(cs *v1alpha1.CatalogSource) bool {
77+
_, err = fetchCatalogSource(crc, catalogSourceName, operatorNamespace, func(cs *v1alpha1.CatalogSource) bool {
7878
before := catalogSource.Status.GRPCConnectionState
7979
after := cs.Status.GRPCConnectionState
8080
if after != nil && after.LastConnectTime.After(before.LastConnectTime.Time) {
@@ -91,8 +91,8 @@ var _ = Describe("Catalog", func() {
9191
defer cleaner.NotifyTestComplete(GinkgoT(), true)
9292

9393
globalNS := operatorNamespace
94-
c := newKubeClient(GinkgoT())
95-
crc := newCRClient(GinkgoT())
94+
c := newKubeClient()
95+
crc := newCRClient()
9696

9797
// Determine which namespace is global. Should be `openshift-marketplace` for OCP 4.2+.
9898
// Locally it is `olm`
@@ -132,10 +132,10 @@ var _ = Describe("Catalog", func() {
132132
}
133133

134134
// Create the initial catalog source
135-
createInternalCatalogSource(GinkgoT(), c, crc, mainCatalogName, globalNS, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV})
135+
createInternalCatalogSource(c, crc, mainCatalogName, globalNS, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV})
136136

137137
// Attempt to get the catalog source before creating install plan
138-
_, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, globalNS, catalogSourceRegistryPodSynced)
138+
_, err := fetchCatalogSource(crc, mainCatalogName, globalNS, catalogSourceRegistryPodSynced)
139139
require.NoError(GinkgoT(), err)
140140

141141
subscriptionSpec := &v1alpha1.SubscriptionSpec{
@@ -182,7 +182,7 @@ var _ = Describe("Catalog", func() {
182182
updateInternalCatalog(GinkgoT(), c, crc, mainCatalogName, globalNS, []apiextensions.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, replacementCSV}, mainManifests)
183183

184184
// Get updated catalogsource
185-
fetchedUpdatedCatalog, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, globalNS, catalogSourceRegistryPodSynced)
185+
fetchedUpdatedCatalog, err := fetchCatalogSource(crc, mainCatalogName, globalNS, catalogSourceRegistryPodSynced)
186186
require.NoError(GinkgoT(), err)
187187

188188
subscription, err = fetchSubscription(GinkgoT(), crc, testNamespace, subscriptionName, subscriptionStateUpgradePendingChecker)
@@ -216,8 +216,8 @@ var _ = Describe("Catalog", func() {
216216
mainCSV := newCSV(mainPackageStable, testNamespace, "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, mainNamedStrategy)
217217
dependentCSV := newCSV(dependentPackageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, dependentNamedStrategy)
218218

219-
c := newKubeClient(GinkgoT())
220-
crc := newCRClient(GinkgoT())
219+
c := newKubeClient()
220+
crc := newCRClient()
221221

222222
mainCatalogName := genName("mock-ocs-main-")
223223

@@ -243,10 +243,10 @@ var _ = Describe("Catalog", func() {
243243
}
244244

245245
// Create the initial catalogsource
246-
createInternalCatalogSource(GinkgoT(), c, crc, mainCatalogName, testNamespace, mainManifests, nil, []v1alpha1.ClusterServiceVersion{mainCSV})
246+
createInternalCatalogSource(c, crc, mainCatalogName, testNamespace, mainManifests, nil, []v1alpha1.ClusterServiceVersion{mainCSV})
247247

248248
// Attempt to get the catalog source before creating install plan
249-
fetchedInitialCatalog, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
249+
fetchedInitialCatalog, err := fetchCatalogSource(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
250250
require.NoError(GinkgoT(), err)
251251

252252
// Get initial configmap
@@ -265,7 +265,7 @@ var _ = Describe("Catalog", func() {
265265
updatedConfigMap, err := c.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.TODO(), fetchedInitialCatalog.Spec.ConfigMap, metav1.GetOptions{})
266266
require.NoError(GinkgoT(), err)
267267

268-
fetchedUpdatedCatalog, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, testNamespace, func(catalog *v1alpha1.CatalogSource) bool {
268+
fetchedUpdatedCatalog, err := fetchCatalogSource(crc, mainCatalogName, testNamespace, func(catalog *v1alpha1.CatalogSource) bool {
269269
before := fetchedInitialCatalog.Status.ConfigMapResource
270270
after := catalog.Status.ConfigMapResource
271271
if after != nil && before.LastUpdateTime.Before(&after.LastUpdateTime) &&
@@ -336,8 +336,8 @@ var _ = Describe("Catalog", func() {
336336
mainCSV := newCSV(mainPackageStable, testNamespace, "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, mainNamedStrategy)
337337
dependentCSV := newCSV(dependentPackageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, dependentNamedStrategy)
338338

339-
c := newKubeClient(GinkgoT())
340-
crc := newCRClient(GinkgoT())
339+
c := newKubeClient()
340+
crc := newCRClient()
341341

342342
mainCatalogName := genName("mock-ocs-main-")
343343

@@ -363,10 +363,10 @@ var _ = Describe("Catalog", func() {
363363
}
364364

365365
// Create the initial catalogsource
366-
_, cleanupSource := createInternalCatalogSource(GinkgoT(), c, crc, mainCatalogName, testNamespace, mainManifests, nil, []v1alpha1.ClusterServiceVersion{mainCSV})
366+
_, cleanupSource := createInternalCatalogSource(c, crc, mainCatalogName, testNamespace, mainManifests, nil, []v1alpha1.ClusterServiceVersion{mainCSV})
367367

368368
// Attempt to get the catalog source before creating install plan
369-
fetchedInitialCatalog, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
369+
fetchedInitialCatalog, err := fetchCatalogSource(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
370370
require.NoError(GinkgoT(), err)
371371
// Get initial configmap
372372
configMap, err := c.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.TODO(), fetchedInitialCatalog.Spec.ConfigMap, metav1.GetOptions{})
@@ -381,7 +381,7 @@ var _ = Describe("Catalog", func() {
381381
cleanupSource()
382382

383383
// create a catalog with the same name
384-
createInternalCatalogSource(GinkgoT(), c, crc, mainCatalogName, testNamespace, append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
384+
createInternalCatalogSource(c, crc, mainCatalogName, testNamespace, append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
385385

386386
// Create Subscription
387387
subscriptionName := genName("sub-")
@@ -427,8 +427,8 @@ var _ = Describe("Catalog", func() {
427427
replacementCSV := newCSV(mainPackageReplacement, testNamespace, mainPackageStable, semver.MustParse("0.2.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, mainNamedStrategy)
428428
dependentCSV := newCSV(dependentPackageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, dependentNamedStrategy)
429429

430-
c := newKubeClient(GinkgoT())
431-
crc := newCRClient(GinkgoT())
430+
c := newKubeClient()
431+
crc := newCRClient()
432432

433433
mainSourceName := genName("mock-ocs-main-")
434434
replacementSourceName := genName("mock-ocs-main-with-replacement-")
@@ -465,13 +465,13 @@ var _ = Describe("Catalog", func() {
465465
}
466466

467467
// Create ConfigMap CatalogSources
468-
createInternalCatalogSource(GinkgoT(), c, crc, mainSourceName, testNamespace, append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
469-
createInternalCatalogSource(GinkgoT(), c, crc, replacementSourceName, testNamespace, append(replacementManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{replacementCSV, mainCSV, dependentCSV})
468+
createInternalCatalogSource(c, crc, mainSourceName, testNamespace, append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
469+
createInternalCatalogSource(c, crc, replacementSourceName, testNamespace, append(replacementManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{replacementCSV, mainCSV, dependentCSV})
470470

471471
// Wait for ConfigMap CatalogSources to be ready
472-
mainSource, err := fetchCatalogSource(GinkgoT(), crc, mainSourceName, testNamespace, catalogSourceRegistryPodSynced)
472+
mainSource, err := fetchCatalogSource(crc, mainSourceName, testNamespace, catalogSourceRegistryPodSynced)
473473
require.NoError(GinkgoT(), err)
474-
replacementSource, err := fetchCatalogSource(GinkgoT(), crc, replacementSourceName, testNamespace, catalogSourceRegistryPodSynced)
474+
replacementSource, err := fetchCatalogSource(crc, replacementSourceName, testNamespace, catalogSourceRegistryPodSynced)
475475
require.NoError(GinkgoT(), err)
476476

477477
// Replicate catalog pods with no OwnerReferences
@@ -563,9 +563,9 @@ var _ = Describe("Catalog", func() {
563563
},
564564
}
565565

566-
c := newKubeClient(GinkgoT())
567-
crc := newCRClient(GinkgoT())
568-
_, cleanupSource := createInternalCatalogSource(GinkgoT(), c, crc, sourceName, testNamespace, manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
566+
c := newKubeClient()
567+
crc := newCRClient()
568+
_, cleanupSource := createInternalCatalogSource(c, crc, sourceName, testNamespace, manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
569569
defer cleanupSource()
570570

571571
// Wait for a new registry pod to be created
@@ -645,15 +645,15 @@ var _ = Describe("Catalog", func() {
645645
},
646646
}
647647

648-
crc := newCRClient(GinkgoT())
648+
crc := newCRClient()
649649
source, err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
650650
require.NoError(GinkgoT(), err)
651651
defer func() {
652652
require.NoError(GinkgoT(), crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Delete(context.TODO(), source.GetName(), metav1.DeleteOptions{}))
653653
}()
654654

655655
// Wait for a new registry pod to be created
656-
c := newKubeClient(GinkgoT())
656+
c := newKubeClient()
657657
selector := labels.SelectorFromSet(map[string]string{"olm.catalogSource": source.GetName()})
658658
singlePod := podCount(1)
659659
registryPods, err := awaitPods(GinkgoT(), c, source.GetNamespace(), selector.String(), singlePod)
@@ -711,8 +711,8 @@ var _ = Describe("Catalog", func() {
711711

712712
// create internal registry for purposes of pushing/pulling IF running e2e test locally
713713
// registry is insecure and for purposes of this test only
714-
c := newKubeClient(GinkgoT())
715-
crc := newCRClient(GinkgoT())
714+
c := newKubeClient()
715+
crc := newCRClient()
716716

717717
local, err := Local(c)
718718
if err != nil {
@@ -969,7 +969,7 @@ var _ = Describe("Catalog", func() {
969969
},
970970
}
971971

972-
crc := newCRClient(GinkgoT())
972+
crc := newCRClient()
973973
source, err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
974974
require.NoError(GinkgoT(), err)
975975
defer func() {

‎test/e2e/crd_e2e_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var _ = Describe("CRD Versions", func() {
2424
By("This test proves that OLM is able to handle v1beta1 CRDs successfully. Creating v1 CRDs has more " +
2525
"restrictions around the schema. v1beta1 validation schemas are not necessarily valid in v1. " +
2626
"OLM should support both v1beta1 and v1 CRDs")
27-
c := newKubeClient(GinkgoT())
28-
crc := newCRClient(GinkgoT())
27+
c := newKubeClient()
28+
crc := newCRClient()
2929

3030
mainPackageName := genName("nginx-update2-")
3131
mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
@@ -76,11 +76,11 @@ var _ = Describe("CRD Versions", func() {
7676
}
7777

7878
// Create the catalog sources
79-
_, cleanupMainCatalogSource := createInternalCatalogSource(GinkgoT(), c, crc, mainCatalogName, testNamespace, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []operatorsv1alpha1.ClusterServiceVersion{mainCSV})
79+
_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, testNamespace, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []operatorsv1alpha1.ClusterServiceVersion{mainCSV})
8080
defer cleanupMainCatalogSource()
8181

8282
// Attempt to get the catalog source before creating install plan
83-
_, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
83+
_, err := fetchCatalogSource(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
8484
Expect(err).ToNot(HaveOccurred())
8585

8686
subscriptionName := genName("sub-nginx-update2-")
@@ -103,8 +103,8 @@ var _ = Describe("CRD Versions", func() {
103103
})
104104
It("creates v1 CRDs with a v1 schema successfully", func() {
105105
By("v1 crds with a valid openapiv3 schema should be created successfully by OLM")
106-
c := newKubeClient(GinkgoT())
107-
crc := newCRClient(GinkgoT())
106+
c := newKubeClient()
107+
crc := newCRClient()
108108

109109
mainPackageName := genName("nginx-update2-")
110110
mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
@@ -152,7 +152,7 @@ var _ = Describe("CRD Versions", func() {
152152
defer cleanupMainCatalogSource()
153153

154154
// Attempt to get the catalog source before creating install plan
155-
_, err := fetchCatalogSource(GinkgoT(), crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
155+
_, err := fetchCatalogSource(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
156156
Expect(err).ToNot(HaveOccurred())
157157

158158
subscriptionName := genName("sub-nginx-update2-")

0 commit comments

Comments
 (0)