🌱 Part 3: Reduce number of variable sources. Installed packages by m1kola · Pull Request #499 · operator-framework/operator-controller

m1kola · 2023-10-31T16:26:07Z

Description

Spliting #460 into smaller chunks. Related to #437

In this part I extract code related to creating installed package variables from InstalledPackageVariableSource and BundleDeploymentVariableSource into a separate function.

InstalledPackageVariableSource gets removed in this PR. BundleDeploymentVariableSource will be removed later in #501

Reviewer Checklist

API Go Documentation
Tests: Unit Tests (and E2E Tests, if appropriate)
Comprehensive Commit Messages
Links to related GitHub Issue(s)

m1kola · 2023-11-03T15:49:04Z

Will keep in draft for now. I think "[FAIL] Operator Install when An operator is installed from an operator catalog [It] resolves again when a new catalog is available" failure is a legit one. From a quick look I do not see what is causing it.

Everything else seems to be a result of it (looks like some dependency between e2e tests).

m1kola · 2023-11-03T16:51:16Z

Will keep in draft for now. I think "[FAIL] Operator Install when An operator is installed from an operator catalog [It] resolves again when a new catalog is available" failure is a legit one. From a quick look I do not see what is causing it.

it was legit issue: I was doing things in incorrect order in BundleDeploymentVariableSource. Fixed now.

Everything else seems to be a result of it (looks like some dependency between e2e tests).

Created an issue for this: #512

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

ncdc · 2023-11-06T15:21:08Z

@joelanford any other comments?

codecov · 2023-11-06T15:24:52Z

Codecov Report

Attention: 11 lines in your changes are missing coverage. Please review.

Comparison is base (55d54ab) 84.41% compared to head (cd784a0) 84.24%.

Additional details and impacted files

@@ Coverage Diff @@## main #499 +/- ##
==========================================
- Coverage 84.41% 84.24% -0.18% 
==========================================
Files 23 23 Lines 892 895 +3 ==========================================
+ Hits 753 754 +1 - Misses 95 96 +1 - Partials 44 45 +1

Flag	Coverage Δ
e2e	`65.69% <58.33%> (-0.23%)`	⬇️
unit	`79.14% <63.88%> (-0.41%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...al/resolution/variablesources/bundle_deployment.go	`100.00% <100.00%> (+21.05%)`	⬆️
...al/resolution/variablesources/installed_package.go	`65.38% <59.25%> (-8.53%)`	⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…ework#499) Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.22.0 to 2.22.2. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.22.0...v2.22.2) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

openshift-ciBot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 31, 2023

m1kola changed the title ~~Part 2: Reduce number of variable sources~~Part 3: Reduce number of variable sourcesOct 31, 2023

This was referenced Oct 31, 2023
🌱 Part 4: Reduce number of variable sources. Required packages #500
Merged
🌱 Part 5: Reduce number of variable sources. Final cleanup #501
Merged

m1kola force-pushed the shrink_variable_sources_p3 branch from 48523f5 to b3ce584Compare October 31, 2023 16:36

m1kola mentioned this pull request Oct 31, 2023
🌱 Reduce number of variable sources #460
Closed
4 tasks

m1kola changed the title ~~Part 3: Reduce number of variable sources~~Part 3: Reduce number of variable sources. Required packagesOct 31, 2023

m1kola changed the title ~~Part 3: Reduce number of variable sources. Required packages~~Part 3: Reduce number of variable sources. Installed packagesOct 31, 2023

m1kola force-pushed the shrink_variable_sources_p3 branch 3 times, most recently from fd46b2f to 3f60963Compare November 2, 2023 17:10

m1kola mentioned this pull request Nov 3, 2023
Respect .spec.upgradeConstraintPolicy#449
Closed

m1kola force-pushed the shrink_variable_sources_p3 branch from 3f60963 to 611072aCompare November 3, 2023 15:33

m1kola force-pushed the shrink_variable_sources_p3 branch 3 times, most recently from 5dabe8f to deb7a6fCompare November 3, 2023 16:44

m1kola marked this pull request as ready for review November 3, 2023 16:57

m1kola requested a review from a team as a code owner November 3, 2023 16:57

openshift-ciBot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 3, 2023

ncdc reviewed Nov 3, 2023
View reviewed changes

Comment threadinternal/resolution/variablesources/installed_package.go

everettraven reviewed Nov 3, 2023
View reviewed changes

Comment threadinternal/resolution/variablesources/bundle_deployment.go

m1kola mentioned this pull request Nov 6, 2023
🌱 Improve installed package error when bundle can not be found #514
Merged
4 tasks

m1kola requested review from everettraven and ncdc November 6, 2023 14:02

m1kola force-pushed the shrink_variable_sources_p3 branch from 220ee92 to d2a06e8Compare November 6, 2023 14:44

joelanford reviewed Nov 6, 2023
View reviewed changes

Comment threadinternal/resolution/variablesources/installed_package.go

Turn installed package variable source into a func
cd784a0
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

m1kola force-pushed the shrink_variable_sources_p3 branch from d2a06e8 to cd784a0Compare November 6, 2023 15:18

ncdc approved these changes Nov 6, 2023
View reviewed changes

m1kola mentioned this pull request Nov 6, 2023
⚠ Remove pointer to BundleTemplate from spec operator-framework/rukpak#758
Merged

m1kola requested a review from joelanford November 6, 2023 15:38

ncdc changed the title ~~Part 3: Reduce number of variable sources. Installed packages~~🌱 Part 3: Reduce number of variable sources. Installed packagesNov 6, 2023

m1kola mentioned this pull request Nov 6, 2023
✨ Respect upgrade constraint policy set on Operator#520
Merged
4 tasks

joelanford approved these changes Nov 6, 2023
View reviewed changes

joelanford added this pull request to the merge queue Nov 6, 2023

Merged via the queue into operator-framework:main with commit 774ab74Nov 6, 2023

m1kola deleted the shrink_variable_sources_p3 branch November 6, 2023 21:24

Navigation Menu

Uh oh!

🌱 Part 3: Reduce number of variable sources. Installed packages - #499

🌱 Part 3: Reduce number of variable sources. Installed packages#499
joelanford merged 1 commit into
operator-framework:mainfrom
m1kola:shrink_variable_sources_p3

m1kola commented Oct 31, 2023•
edited
Loading

Uh oh!

m1kola commented Nov 3, 2023

Uh oh!

m1kola commented Nov 3, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ncdc commented Nov 6, 2023

Uh oh!

codecovBot commented Nov 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

m1kola commented Oct 31, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Reviewer Checklist

Uh oh!

m1kola commented Nov 3, 2023

Uh oh!

m1kola commented Nov 3, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ncdc commented Nov 6, 2023

Uh oh!

codecovBot commented Nov 6, 2023

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

m1kola commented Oct 31, 2023•
edited
Loading