Skip to content

Commit 935fc47

Browse files
stevekuznetsovstevekuznetsov
committed
test/e2e: don't use internal versions of api extensions
The internal versions of the API Extensions client objects are what client calls get converted into for processing within the server. This mechanism allows many different clients to use many different outward-facing versions, while the code within the server only ever runs against one type. There is no utility to these types outside of the server, especially for code that's making client calls. We can simply use the client-facing types and not require coversion anywhere. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent 242f63f commit 935fc47

13 files changed

+439
-476
lines changed

‎test/e2e/catalog_e2e_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
1717
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
1818
packageserverclientset "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/client/clientset/versioned"
19+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1920
k8serror "k8s.io/apimachinery/pkg/api/errors"
2021
"sigs.k8s.io/controller-runtime/pkg/client"
2122

@@ -24,7 +25,6 @@ import (
2425
. "github.com/onsi/gomega"
2526
appsv1 "k8s.io/api/apps/v1"
2627
corev1 "k8s.io/api/core/v1"
27-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
2828
"k8s.io/apimachinery/pkg/api/meta"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/labels"
@@ -93,7 +93,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
9393
}
9494

9595
crd := newCRD(genName("ins-"))
96-
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, nil)
96+
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{crd}, nil, nil)
9797

9898
defer func() {
9999
Eventually(func() error {
@@ -105,7 +105,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
105105
}()
106106

107107
catalogSourceName := genName("mock-ocs-")
108-
_, cleanupSource := createInternalCatalogSource(c, crc, catalogSourceName, generatedNamespace.GetName(), manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
108+
_, cleanupSource := createInternalCatalogSource(c, crc, catalogSourceName, generatedNamespace.GetName(), manifests, []apiextensionsv1.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
109109
defer cleanupSource()
110110

111111
// ensure the mock catalog exists and has been synced by the catalog operator
@@ -147,8 +147,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
147147
stableChannel := "stable"
148148

149149
mainCRD := newCRD(genName("ins-"))
150-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{mainCRD}, nil, nil)
151-
replacementCSV := newCSV(mainPackageReplacement, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.2.0"), []apiextensions.CustomResourceDefinition{mainCRD}, nil, nil)
150+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{mainCRD}, nil, nil)
151+
replacementCSV := newCSV(mainPackageReplacement, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.2.0"), []apiextensionsv1.CustomResourceDefinition{mainCRD}, nil, nil)
152152

153153
defer func() {
154154
Eventually(func() error {
@@ -176,7 +176,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
176176
}
177177

178178
// Create the initial catalog source
179-
cs, cleanup := createInternalCatalogSource(c, crc, mainCatalogName, globalCatalogNamespace, mainManifests, []apiextensions.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV})
179+
cs, cleanup := createInternalCatalogSource(c, crc, mainCatalogName, globalCatalogNamespace, mainManifests, []apiextensionsv1.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV})
180180
defer cleanup()
181181

182182
// Attempt to get the catalog source before creating install plan
@@ -229,7 +229,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
229229
}
230230

231231
// Update catalog configmap
232-
updateInternalCatalog(GinkgoT(), c, crc, cs.GetName(), cs.GetNamespace(), []apiextensions.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, replacementCSV}, mainManifests)
232+
updateInternalCatalog(GinkgoT(), c, crc, cs.GetName(), cs.GetNamespace(), []apiextensionsv1.CustomResourceDefinition{mainCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, replacementCSV}, mainManifests)
233233

234234
// Get updated catalogsource
235235
fetchedUpdatedCatalog, err := fetchCatalogSourceOnStatus(crc, cs.GetName(), cs.GetNamespace(), catalogSourceRegistryPodSynced())
@@ -256,8 +256,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
256256
stableChannel := "stable"
257257

258258
dependentCRD := newCRD(genName("ins-"))
259-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
260-
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, nil)
259+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
260+
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil, nil)
261261

262262
defer func() {
263263
Eventually(func() error {
@@ -311,7 +311,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
311311
Expect(initialPods.Items).To(HaveLen(1))
312312

313313
// Update catalog configmap
314-
updateInternalCatalog(GinkgoT(), c, crc, mainCatalogName, generatedNamespace.GetName(), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV}, append(mainManifests, dependentManifests...))
314+
updateInternalCatalog(GinkgoT(), c, crc, mainCatalogName, generatedNamespace.GetName(), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV}, append(mainManifests, dependentManifests...))
315315

316316
fetchedUpdatedCatalog, err := fetchCatalogSourceOnStatus(crc, mainCatalogName, generatedNamespace.GetName(), func(catalog *v1alpha1.CatalogSource) bool {
317317
before := fetchedInitialCatalog.Status.ConfigMapResource
@@ -389,8 +389,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
389389
stableChannel := "stable"
390390

391391
dependentCRD := newCRD(genName("ins-"))
392-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
393-
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, nil)
392+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
393+
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil, nil)
394394

395395
defer func() {
396396
Eventually(func() error {
@@ -446,7 +446,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
446446
cleanupSource()
447447

448448
// create a catalog with the same name
449-
createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
449+
createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), append(mainManifests, dependentManifests...), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
450450

451451
// Create Subscription
452452
subscriptionName := genName("sub-")
@@ -482,9 +482,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
482482
stableChannel := "stable"
483483

484484
dependentCRD := newCRD(genName("ins-"))
485-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
486-
replacementCSV := newCSV(mainPackageReplacement, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.2.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
487-
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, nil)
485+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
486+
replacementCSV := newCSV(mainPackageReplacement, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.2.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
487+
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil, nil)
488488

489489
defer func() {
490490
Eventually(func() error {
@@ -536,8 +536,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
536536
}
537537

538538
// Create ConfigMap CatalogSources
539-
createInternalCatalogSource(c, crc, mainSourceName, generatedNamespace.GetName(), append(mainManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
540-
createInternalCatalogSource(c, crc, replacementSourceName, generatedNamespace.GetName(), append(replacementManifests, dependentManifests...), []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{replacementCSV, mainCSV, dependentCSV})
539+
createInternalCatalogSource(c, crc, mainSourceName, generatedNamespace.GetName(), append(mainManifests, dependentManifests...), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{mainCSV, dependentCSV})
540+
createInternalCatalogSource(c, crc, replacementSourceName, generatedNamespace.GetName(), append(replacementManifests, dependentManifests...), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{replacementCSV, mainCSV, dependentCSV})
541541

542542
// Wait for ConfigMap CatalogSources to be ready
543543
mainSource, err := fetchCatalogSourceOnStatus(crc, mainSourceName, generatedNamespace.GetName(), catalogSourceRegistryPodSynced())
@@ -630,7 +630,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
630630
stableChannel := "stable"
631631
sourceName := genName("catalog-")
632632
crd := newCRD(genName("ins-"))
633-
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, nil)
633+
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{crd}, nil, nil)
634634
manifests := []registry.PackageManifest{
635635
{
636636
PackageName: packageName,
@@ -650,7 +650,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
650650
}).Should(Succeed())
651651
}()
652652

653-
_, cleanupSource := createInternalCatalogSource(c, crc, sourceName, generatedNamespace.GetName(), manifests, []apiextensions.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
653+
_, cleanupSource := createInternalCatalogSource(c, crc, sourceName, generatedNamespace.GetName(), manifests, []apiextensionsv1.CustomResourceDefinition{crd}, []v1alpha1.ClusterServiceVersion{csv})
654654
defer cleanupSource()
655655

656656
// Wait for a new registry pod to be created

‎test/e2e/crd_e2e_test.go

+30-31
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
1616
corev1 "k8s.io/api/core/v1"
1717

18-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
1918
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2019
apierrors "k8s.io/apimachinery/pkg/api/errors"
2120
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -125,19 +124,19 @@ var _ = Describe("CRD Versions", func() {
125124

126125
crdPlural := genName("ins-")
127126
crdName := crdPlural + ".cluster.com"
128-
oldCRD := apiextensions.CustomResourceDefinition{
127+
oldCRD := apiextensionsv1.CustomResourceDefinition{
129128
ObjectMeta: metav1.ObjectMeta{
130129
Name: crdName,
131130
},
132-
Spec: apiextensions.CustomResourceDefinitionSpec{
131+
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
133132
Group: "cluster.com",
134-
Versions: []apiextensions.CustomResourceDefinitionVersion{
133+
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
135134
{
136135
Name: "v1alpha2",
137136
Served: true,
138137
Storage: true,
139-
Schema: &apiextensions.CustomResourceValidation{
140-
OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
138+
Schema: &apiextensionsv1.CustomResourceValidation{
139+
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
141140
Type: "object",
142141
Description: "my crd schema",
143142
},
@@ -147,39 +146,39 @@ var _ = Describe("CRD Versions", func() {
147146
Name: "v2alpha1",
148147
Served: true,
149148
Storage: false,
150-
Schema: &apiextensions.CustomResourceValidation{
151-
OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
149+
Schema: &apiextensionsv1.CustomResourceValidation{
150+
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
152151
Type: "object",
153152
Description: "my crd schema",
154153
},
155154
},
156155
},
157156
},
158-
Names: apiextensions.CustomResourceDefinitionNames{
157+
Names: apiextensionsv1.CustomResourceDefinitionNames{
159158
Plural: crdPlural,
160159
Singular: crdPlural,
161160
Kind: crdPlural,
162161
ListKind: "list" + crdPlural,
163162
},
164-
Scope: apiextensions.NamespaceScoped,
163+
Scope: apiextensionsv1.NamespaceScoped,
165164
},
166165
}
167166

168167
alphaChannel := "alpha"
169168
mainPackageAlpha := fmt.Sprintf("%s-alpha", mainPackageName)
170-
newCRD := apiextensions.CustomResourceDefinition{
169+
newCRD := apiextensionsv1.CustomResourceDefinition{
171170
ObjectMeta: metav1.ObjectMeta{
172171
Name: crdName,
173172
},
174-
Spec: apiextensions.CustomResourceDefinitionSpec{
173+
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
175174
Group: "cluster.com",
176-
Versions: []apiextensions.CustomResourceDefinitionVersion{
175+
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
177176
{
178177
Name: "v1alpha3",
179178
Served: true,
180179
Storage: true,
181-
Schema: &apiextensions.CustomResourceValidation{
182-
OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
180+
Schema: &apiextensionsv1.CustomResourceValidation{
181+
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
183182
Type: "object",
184183
Description: "my crd schema",
185184
},
@@ -189,26 +188,26 @@ var _ = Describe("CRD Versions", func() {
189188
Name: "v2alpha2",
190189
Served: true,
191190
Storage: false,
192-
Schema: &apiextensions.CustomResourceValidation{
193-
OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
191+
Schema: &apiextensionsv1.CustomResourceValidation{
192+
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
194193
Type: "object",
195194
Description: "my crd schema",
196195
},
197196
},
198197
},
199198
},
200-
Names: apiextensions.CustomResourceDefinitionNames{
199+
Names: apiextensionsv1.CustomResourceDefinitionNames{
201200
Plural: crdPlural,
202201
Singular: crdPlural,
203202
Kind: crdPlural,
204203
ListKind: "list" + crdPlural,
205204
},
206-
Scope: apiextensions.NamespaceScoped,
205+
Scope: apiextensionsv1.NamespaceScoped,
207206
},
208207
}
209208

210-
oldCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{oldCRD}, nil, nil)
211-
newCSV := newCSV(mainPackageAlpha, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.1.1"), []apiextensions.CustomResourceDefinition{newCRD}, nil, nil)
209+
oldCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{oldCRD}, nil, nil)
210+
newCSV := newCSV(mainPackageAlpha, generatedNamespace.GetName(), mainPackageStable, semver.MustParse("0.1.1"), []apiextensionsv1.CustomResourceDefinition{newCRD}, nil, nil)
212211
mainCatalogName := genName("mock-ocs-main-update2-")
213212
mainManifests := []registry.PackageManifest{
214213
{
@@ -222,7 +221,7 @@ var _ = Describe("CRD Versions", func() {
222221
}
223222

224223
// Create the catalog sources
225-
_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), mainManifests, []apiextensions.CustomResourceDefinition{oldCRD, newCRD}, []operatorsv1alpha1.ClusterServiceVersion{oldCSV, newCSV})
224+
_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), mainManifests, []apiextensionsv1.CustomResourceDefinition{oldCRD, newCRD}, []operatorsv1alpha1.ClusterServiceVersion{oldCSV, newCSV})
226225
defer cleanupMainCatalogSource()
227226
defer func() {
228227
_ = crc.OperatorsV1alpha1().ClusterServiceVersions(generatedNamespace.GetName()).Delete(context.TODO(), oldCSV.GetName(), metav1.DeleteOptions{})
@@ -369,39 +368,39 @@ var _ = Describe("CRD Versions", func() {
369368
}).Should(BeNil())
370369

371370
// create CSV and catalog with just the catalog CRD
372-
catalogCRD := apiextensions.CustomResourceDefinition{
371+
catalogCRD := apiextensionsv1.CustomResourceDefinition{
373372
ObjectMeta: metav1.ObjectMeta{
374373
Name: crdName,
375374
},
376-
Spec: apiextensions.CustomResourceDefinitionSpec{
375+
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
377376
Group: crdGroup,
378-
Versions: []apiextensions.CustomResourceDefinitionVersion{
377+
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
379378
{
380379
Name: "v1alpha2",
381380
Served: true,
382381
Storage: true,
383-
Schema: &apiextensions.CustomResourceValidation{
384-
OpenAPIV3Schema: &apiextensions.JSONSchemaProps{
382+
Schema: &apiextensionsv1.CustomResourceValidation{
383+
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
385384
Type: "object",
386385
Description: "my crd schema",
387386
},
388387
},
389388
},
390389
},
391-
Names: apiextensions.CustomResourceDefinitionNames{
390+
Names: apiextensionsv1.CustomResourceDefinitionNames{
392391
Plural: crdPlural,
393392
Singular: crdPlural,
394393
Kind: crdPlural,
395394
ListKind: "list" + crdPlural,
396395
},
397-
Scope: apiextensions.NamespaceScoped,
396+
Scope: apiextensionsv1.NamespaceScoped,
398397
},
399398
}
400399

401400
mainPackageName := genName("nginx-update2-")
402401
mainPackageStable := fmt.Sprintf("%s-stable", mainPackageName)
403402
stableChannel := "stable"
404-
catalogCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{catalogCRD}, nil, nil)
403+
catalogCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{catalogCRD}, nil, nil)
405404
defer func() {
406405
_ = crc.OperatorsV1alpha1().ClusterServiceVersions(generatedNamespace.GetName()).Delete(context.TODO(), catalogCSV.GetName(), metav1.DeleteOptions{})
407406
_ = c.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), catalogCRD.GetName(), metav1.DeleteOptions{})
@@ -419,7 +418,7 @@ var _ = Describe("CRD Versions", func() {
419418
}
420419

421420
// Create the catalog sources
422-
_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), mainManifests, []apiextensions.CustomResourceDefinition{catalogCRD}, []operatorsv1alpha1.ClusterServiceVersion{catalogCSV})
421+
_, cleanupMainCatalogSource := createInternalCatalogSource(c, crc, mainCatalogName, generatedNamespace.GetName(), mainManifests, []apiextensionsv1.CustomResourceDefinition{catalogCRD}, []operatorsv1alpha1.ClusterServiceVersion{catalogCSV})
423422
defer cleanupMainCatalogSource()
424423

425424
// Attempt to get the catalog source before creating install plan

0 commit comments

Comments
 (0)