Skip to content

Commit a273449

Browse files
perdasilvaPer Goncalves da Silva
and
Per Goncalves da Silva
authored
Fix up CRD with deprecated version e2e flake (#3386)
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent 578ad82 commit a273449

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

test/e2e/installplan_e2e_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ var _ = Describe("Install Plan", func() {
14351435
// excluded: new CRD, same version, same schema - won't trigger a CRD update
14361436

14371437
tableEntries := []TableEntry{
1438-
Entry("[FLAKE] upgrade CRD with deprecated version", schemaPayload{
1438+
Entry("upgrade CRD with deprecated version", schemaPayload{
14391439
name: "upgrade CRD with deprecated version",
14401440
expectedPhase: operatorsv1alpha1.InstallPlanPhaseComplete,
14411441
oldCRD: func() *apiextensionsv1.CustomResourceDefinition {
@@ -1471,7 +1471,7 @@ var _ = Describe("Install Plan", func() {
14711471
},
14721472
{
14731473
Name: "v1alpha1",
1474-
Served: false,
1474+
Served: true,
14751475
Storage: false,
14761476
Schema: &apiextensionsv1.CustomResourceValidation{
14771477
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
@@ -1631,7 +1631,6 @@ var _ = Describe("Install Plan", func() {
16311631
fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, installPlanName, generatedNamespace.GetName(), buildInstallPlanPhaseCheckFunc(operatorsv1alpha1.InstallPlanPhaseComplete, operatorsv1alpha1.InstallPlanPhaseFailed))
16321632
require.NoError(GinkgoT(), err)
16331633
GinkgoT().Logf("Install plan %s fetched with status %s", fetchedInstallPlan.GetName(), fetchedInstallPlan.Status.Phase)
1634-
16351634
require.Equal(GinkgoT(), tt.expectedPhase, fetchedInstallPlan.Status.Phase)
16361635

16371636
By(`Ensure correct in-cluster resource(s)`)
@@ -1688,7 +1687,6 @@ var _ = Describe("Install Plan", func() {
16881687
validateCRDVersions(GinkgoT(), c, tt.oldCRD.GetName(), expectedVersions)
16891688
GinkgoT().Logf("All expected resources resolved %s", fetchedCSV.Status.Phase)
16901689
}, tableEntries)
1691-
16921690
})
16931691

16941692
Describe("update catalog for subscription", func() {

0 commit comments

Comments
 (0)