Skip to content

Commit 84c3b96

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#674 from perdasilva/perdasilva/backport-e2e
NO-ISSUE: [release-4.14] Backport e2e fixes to 4.14
2 parents 1a03f4b + 55e6a18 commit 84c3b96

14 files changed

+849
-775
lines changed

‎staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
1616
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
17+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1718
k8serror "k8s.io/apimachinery/pkg/api/errors"
1819
"sigs.k8s.io/controller-runtime/pkg/client"
1920

@@ -22,7 +23,6 @@ import (
2223
. "github.com/onsi/gomega"
2324
appsv1 "k8s.io/api/apps/v1"
2425
corev1 "k8s.io/api/core/v1"
25-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
2626
"k8s.io/apimachinery/pkg/api/meta"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/labels"
@@ -89,7 +89,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
8989
}
9090

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

9494
defer func() {
9595
Eventually(func() error {
@@ -101,7 +101,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
101101
}()
102102

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

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

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

149149
defer func() {
150150
Eventually(func() error {
@@ -172,7 +172,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
172172
}
173173

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

178178
// Attempt to get the catalog source before creating install plan
@@ -225,7 +225,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
225225
}
226226

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

230230
// Get updated catalogsource
231231
fetchedUpdatedCatalog, err := fetchCatalogSourceOnStatus(crc, cs.GetName(), cs.GetNamespace(), catalogSourceRegistryPodSynced)
@@ -252,8 +252,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
252252
stableChannel := "stable"
253253

254254
dependentCRD := newCRD(genName("ins-"))
255-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
256-
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, nil)
255+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
256+
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil, nil)
257257

258258
defer func() {
259259
Eventually(func() error {
@@ -307,7 +307,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
307307
Expect(initialPods.Items).To(HaveLen(1))
308308

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

312312
fetchedUpdatedCatalog, err := fetchCatalogSourceOnStatus(crc, mainCatalogName, generatedNamespace.GetName(), func(catalog *v1alpha1.CatalogSource) bool {
313313
before := fetchedInitialCatalog.Status.ConfigMapResource
@@ -385,8 +385,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
385385
stableChannel := "stable"
386386

387387
dependentCRD := newCRD(genName("ins-"))
388-
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{dependentCRD}, nil)
389-
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, nil)
388+
mainCSV := newCSV(mainPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), nil, []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil)
389+
dependentCSV := newCSV(dependentPackageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{dependentCRD}, nil, nil)
390390

391391
defer func() {
392392
Eventually(func() error {
@@ -442,7 +442,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
442442
cleanupSource()
443443

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

447447
// Create Subscription
448448
subscriptionName := genName("sub-")
@@ -478,9 +478,9 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
478478
stableChannel := "stable"
479479

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

485485
defer func() {
486486
Eventually(func() error {
@@ -532,8 +532,8 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
532532
}
533533

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

538538
// Wait for ConfigMap CatalogSources to be ready
539539
mainSource, err := fetchCatalogSourceOnStatus(crc, mainSourceName, generatedNamespace.GetName(), catalogSourceRegistryPodSynced)
@@ -626,7 +626,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
626626
stableChannel := "stable"
627627
sourceName := genName("catalog-")
628628
crd := newCRD(genName("ins-"))
629-
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, nil)
629+
csv := newCSV(packageStable, generatedNamespace.GetName(), "", semver.MustParse("0.1.0"), []apiextensionsv1.CustomResourceDefinition{crd}, nil, nil)
630630
manifests := []registry.PackageManifest{
631631
{
632632
PackageName: packageName,
@@ -646,7 +646,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
646646
}).Should(Succeed())
647647
}()
648648

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

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

0 commit comments

Comments
 (0)