feat(catalog): Add catalog weighting to dependency resolver #1682

harishsurf · 2020-07-27T13:26:04Z

Signed-off-by: Harish hgovinda@redhat.com

Description of the change:
This PR includes Priority field (on the catalog source) to sort catalog source based on priority which is later consumed by the dependency resolver.

Higher priority value is preferred over lower priority
The default priority for custom catsrc is 0.
Sorting precedence for catsrc is namespace > priority > name

Motivation for the change:

Reviewer Checklist

Implementation matches the proposed design, or proposal is updated to match implementation
Sufficient unit test coverage
Sufficient end-to-end test coverage
Docs updated or added to /docs
Commit messages sensible and descriptive

Bowenislandsong · 2020-07-27T14:13:56Z

This PR failed tests for 1 times with 2 individual failed tests and 4 skipped tests. A test is considered flaky if failed on multiple commits.

totaltestcount: 1
flaketestcount: 2
skippedtestcount: 4
flaketests:

classname: End-to-end
name: 'Subscription creation in case of transferring providedAPIs'
counts: 3
details:

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:1379

	Error Trace:	subscription_e2e_test.go:1517
	            				runner.go:113
	            				runner.go:64
	            				it_node.go:26
	            				spec.go:215
	            				spec.go:138
	            				spec_runner.go:200
	            				spec_runner.go:170
	            				spec_runner.go:66
	            				suite.go:62
	            				ginkgo_dsl.go:226
	            				ginkgo_dsl.go:214
	            				e2e_test.go:54
	Error:      	Received unexpected error:
	            	timed out waiting for the condition

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/vendor/github.com/stretchr/testify/require/require.go:1005

meandurationsec: 385.68525033333333

classname: End-to-end
name: 'Garbage collection for dependent resources when a bundle with a new configmap
is installed when the subscription is updated to a later CSV with a configmap
with a new name should have removed the old configmap and put the new configmap
in place'
counts: 1
details:

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/gc_e2e_test.go:507
could not get installplan at complete phase
Unexpected error:
    <*errors.errorString | 0xc0001f82a0>: {
        s: "timed out waiting for the condition",
    }
    timed out waiting for the condition
occurred
/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/gc_e2e_test.go:547

meandurationsec: 312.100609
skippedtests:

classname: End-to-end
name: 'Subscriptions create required objects from Catalogs Given a Namespace
when a CatalogSource is created with a bundle that contains prometheus objects
creating a subscription using the CatalogSource should install the operator
successfully'
counts: 1
details: []
meandurationsec: 20.075543
classname: End-to-end
name: 'Subscriptions create required objects from Catalogs Given a Namespace
when a CatalogSource is created with a bundle that contains prometheus objects
creating a subscription using the CatalogSource should have created the expected
prometheus objects'
counts: 1
details: []
meandurationsec: 15.079386
classname: End-to-end
name: 'Catalog image update'
counts: 1
details: []
meandurationsec: 0.02003
classname: End-to-end
name: 'Subscription updates existing install plan'
counts: 1
details: []
meandurationsec: 0.151669

pkg/controller/registry/resolver/cache.go

Bowenislandsong · 2020-07-29T17:34:47Z

This PR failed tests for 1 times with 2 individual failed tests and 4 skipped tests. A test is considered flaky if failed on multiple commits.

totaltestcount: 1
flaketestcount: 2
skippedtestcount: 4
flaketests:

classname: End-to-end
name: 'Subscription puppeting CatalogSource health status when missing target
catalog should surface the missing catalog'
counts: 3
details:

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:588
Unexpected error:
    <*errors.errorString | 0xc0012dfe70>: {
        s: "E2E bug detected: configmaps \"mock-ocs\" already exists",
    }
    E2E bug detected: configmaps "mock-ocs" already exists
occurred
/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:590

meandurationsec: 0.03879866666666667

classname: End-to-end
name: 'Subscription with dependencies from different catsrc with priorities'
counts: 2
details:

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:1369

	Error Trace:	subscription_e2e_test.go:1521
	            				runner.go:113
	            				runner.go:64
	            				it_node.go:26
	            				spec.go:215
	            				spec.go:138
	            				spec_runner.go:200
	            				spec_runner.go:170
	            				spec_runner.go:66
	            				suite.go:62
	            				ginkgo_dsl.go:226
	            				ginkgo_dsl.go:214
	            				e2e_test.go:54
	Error:      	Received unexpected error:
	            	clusterserviceversions.operators.coreos.com "csv-main" not found

/home/runner/work/operator-lifecycle-manager/operator-lifecycle-manager/vendor/github.com/stretchr/testify/require/require.go:1005

meandurationsec: 26.818526
skippedtests:

classname: End-to-end
name: 'Subscriptions create required objects from Catalogs Given a Namespace
when a CatalogSource is created with a bundle that contains prometheus objects
creating a subscription using the CatalogSource should have created the expected
prometheus objects'
counts: 1
details: []
meandurationsec: 23.258269
classname: End-to-end
name: 'Subscription updates existing install plan'
counts: 1
details: []
meandurationsec: 0.071045
classname: End-to-end
name: 'Subscriptions create required objects from Catalogs Given a Namespace
when a CatalogSource is created with a bundle that contains prometheus objects
creating a subscription using the CatalogSource should install the operator
successfully'
counts: 1
details: []
meandurationsec: 10.226736
classname: End-to-end
name: 'Catalog image update'
counts: 1
details: []
meandurationsec: 0.553019

Bowenislandsong

2 nits, the rest lgtm.
This PR should be opened against master now since we are not merging onto new-resolver anymore. The amount of retest is going too wild.

pkg/controller/registry/resolver/cache.go

dinhxuanvu · 2020-07-30T08:34:27Z

/hold

test/e2e/subscription_e2e_test.go

openshift-bot · 2020-08-03T13:25:53Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T13:51:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

dinhxuanvu · 2020-08-03T16:05:48Z

/hold

benluddy · 2020-08-03T17:48:42Z

/hold cancel
/retest

Bowenislandsong · 2020-08-03T18:12:21Z

/retest

openshift-bot · 2020-08-03T20:47:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T00:15:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T01:47:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T01:59:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T02:12:54Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T02:25:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T02:38:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T03:04:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T03:17:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T03:43:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T03:57:00Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T04:09:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T04:22:58Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T04:35:58Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T05:15:03Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T05:54:20Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T06:06:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T07:24:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-04T08:04:03Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2020-08-04T08:05:22Z

@harishsurf: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/verify	`bcba3c2`	link	`/test verify`
ci/prow/images	`bcba3c2`	link	`/test images`
ci/prow/unit	`bcba3c2`	link	`/test unit`
ci/prow/e2e-aws-olm	`bcba3c2`	link	`/test e2e-aws-olm`
ci/prow/e2e-aws-console-olm	`bcba3c2`	link	`/test e2e-aws-console-olm`
ci/prow/e2e-gcp	`bcba3c2`	link	`/test e2e-gcp`
ci/prow/e2e-gcp-upgrade	`bcba3c2`	link	`/test e2e-gcp-upgrade`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

dinhxuanvu · 2020-08-04T09:17:10Z

Replaced by #1705

openshift-ci-robot requested review from ecordell and gallettilance July 27, 2020 13:26

harishsurf mentioned this pull request Jul 27, 2020

WIP: Catalog Source weighting for dependency resolution #1681

Closed

5 tasks

harishsurf changed the title ~~Add catalog weighting to dependency resolver~~ [WIP] Add catalog weighting to dependency resolver Jul 27, 2020

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 27, 2020

ecordell force-pushed the new-resolver branch 2 times, most recently from 46de607 to 64fc053 Compare July 27, 2020 16:13

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 28, 2020

ecordell force-pushed the new-resolver branch from 64fc053 to 2467b25 Compare July 28, 2020 14:12

harishsurf force-pushed the test-resolver branch from 77e14ef to e7fa82a Compare July 28, 2020 16:24

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 28, 2020

anik120 mentioned this pull request Jul 28, 2020

[default] Switch default OperatorSources to CatalogSources operator-framework/operator-marketplace#318

Merged

5 tasks

harishsurf force-pushed the test-resolver branch 3 times, most recently from eb3d9f8 to 5a64b6a Compare July 28, 2020 17:14

benluddy reviewed Jul 28, 2020

View reviewed changes

pkg/controller/registry/resolver/cache.go Outdated Show resolved Hide resolved

pkg/controller/registry/resolver/cache.go Outdated Show resolved Hide resolved

pkg/controller/registry/resolver/cache.go Outdated Show resolved Hide resolved

dinhxuanvu added the area/dependency Issues or PRs related to dependency changes label Jul 29, 2020

harishsurf force-pushed the test-resolver branch from 5a64b6a to 3e10bd5 Compare July 29, 2020 16:41

harishsurf force-pushed the test-resolver branch from 3e10bd5 to 9441a0d Compare July 29, 2020 19:17

Bowenislandsong reviewed Jul 29, 2020

View reviewed changes

pkg/controller/registry/resolver/cache.go Outdated Show resolved Hide resolved

pkg/controller/registry/resolver/cache.go Show resolved Hide resolved

Bowenislandsong mentioned this pull request Jul 29, 2020

[wip] [test PR]Feat/catsrc weighting #1688

Closed

5 tasks

dinhxuanvu changed the title ~~[WIP] Add catalog weighting to dependency resolver~~ feat(catalog): Add catalog weighting to dependency resolver Jul 30, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 30, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 30, 2020

harishsurf force-pushed the test-resolver branch from 9441a0d to 07d14dd Compare July 30, 2020 14:18

benluddy reviewed Jul 30, 2020

View reviewed changes

test/e2e/subscription_e2e_test.go Outdated Show resolved Hide resolved

test/e2e/subscription_e2e_test.go Outdated Show resolved Hide resolved

dinhxuanvu changed the base branch from new-resolver to master July 30, 2020 15:42

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2020

dinhxuanvu closed this Aug 4, 2020

Bowenislandsong mentioned this pull request Aug 4, 2020

Add Catalog Source priority for dependency resolution #1706

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(catalog): Add catalog weighting to dependency resolver #1682

feat(catalog): Add catalog weighting to dependency resolver #1682

harishsurf commented Jul 27, 2020 •

edited

Loading

Bowenislandsong commented Jul 27, 2020

Bowenislandsong commented Jul 29, 2020

Bowenislandsong left a comment

dinhxuanvu commented Jul 30, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

dinhxuanvu commented Aug 3, 2020

benluddy commented Aug 3, 2020

Bowenislandsong commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-ci-robot commented Aug 4, 2020

dinhxuanvu commented Aug 4, 2020

feat(catalog): Add catalog weighting to dependency resolver #1682

feat(catalog): Add catalog weighting to dependency resolver #1682

Conversation

harishsurf commented Jul 27, 2020 • edited Loading

Bowenislandsong commented Jul 27, 2020

Bowenislandsong commented Jul 29, 2020

Bowenislandsong left a comment

Choose a reason for hiding this comment

dinhxuanvu commented Jul 30, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

dinhxuanvu commented Aug 3, 2020

benluddy commented Aug 3, 2020

Bowenislandsong commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-bot commented Aug 4, 2020

openshift-ci-robot commented Aug 4, 2020

dinhxuanvu commented Aug 4, 2020

harishsurf commented Jul 27, 2020 •

edited

Loading