Skip to content

🌱 Descriptive Upgrade Constraint Policy constants - #1233

Merged
joelanford merged 2 commits into
operator-framework:mainfrom
skattoju:desc_upgradeconstraintpolicy
Sep 11, 2024
Merged

🌱 Descriptive Upgrade Constraint Policy constants#1233
joelanford merged 2 commits into
operator-framework:mainfrom
skattoju:desc_upgradeconstraintpolicy

Conversation

@skattoju

@skattojuskattoju commented Sep 9, 2024•
edited by joelanford
Loading

Copy link
Copy Markdown
Contributor

Fixes#1151

This PR renames the constant values used in the API for UpgradeConstraintPolicy and updates their references in the documentation.

@openshift-ciopenshift-ciBot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 9, 2024
@netlify

netlifyBot commented Sep 9, 2024•
edited
Loading

Copy link
Copy Markdown

✅ Deploy Preview for olmv1 ready!

NameLink
🔨 Latest commit8f9b615
🔍 Latest deploy loghttps://app.netlify.com/sites/olmv1/deploys/66e1951a3fb51b0008e49163
😎 Deploy Previewhttps://deploy-preview-1233--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@skattojuskattoju changed the title Descriptive Upgrade Constraint Policy constants🌱 Descriptive Upgrade Constraint Policy constantsSep 9, 2024
@skattoju
skattojuforce-pushed the desc_upgradeconstraintpolicy branch from f4ecb7c to eb4ca3fCompareSeptember 9, 2024 14:22
@skattoju
skattoju marked this pull request as ready for review September 9, 2024 14:25
@skattoju
skattoju requested a review from a team as a code ownerSeptember 9, 2024 14:25
@openshift-ciopenshift-ciBot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 9, 2024
@codecov

codecovBot commented Sep 9, 2024•
edited
Loading

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.49%. Comparing base (57ac405) to head (8f9b615).
Report is 10 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #1233 +/- ##
==========================================
- Coverage 76.53% 76.49% -0.05% 
==========================================
Files 40 40 Lines 2340 2336 -4 ==========================================
- Hits 1791 1787 -4 
Misses 392 392 Partials 157 157
FlagCoverage Δ
e2e57.57% <100.00%> (-0.08%)⬇️
unit52.39% <100.00%> (-0.09%)⬇️

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

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

everettraven
everettraven reviewed Sep 9, 2024
View reviewed changes
Comment threadapi/v1alpha1/clusterextension_types.go
everettraven
everettraven suggested changes Sep 9, 2024
View reviewed changes

@everettraveneverettraven left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one change that stood out to me as needing to be made

@skattoju
skattojuforce-pushed the desc_upgradeconstraintpolicy branch 2 times, most recently from 9adaa25 to bc22edaCompareSeptember 9, 2024 16:30
LalatenduMohanty
LalatenduMohanty previously approved these changes Sep 9, 2024
View reviewed changes

@LalatenduMohantyLalatenduMohanty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2024
@LalatenduMohanty

LalatenduMohanty commented Sep 9, 2024

Copy link
Copy Markdown
Member

Conflicts because PR #1237 has merged

everettraven
everettraven previously approved these changes Sep 9, 2024
View reviewed changes
@skattoju
skattojuforce-pushed the desc_upgradeconstraintpolicy branch from bc22eda to f6da41eCompareSeptember 9, 2024 20:40
@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2024
@everettraven

everettraven commented Sep 9, 2024

Copy link
Copy Markdown
Contributor

Approved and then looked at CI - looks like you need to:

  • rebase and resolve merge conflicts
  • regenerate manifests with make manifests

@skattoju

skattoju commented Sep 9, 2024

Copy link
Copy Markdown
ContributorAuthor

I've rebased and resolved conflicts. The CI failures are because we are changing the API right ?

@everettraven

everettraven commented Sep 10, 2024

Copy link
Copy Markdown
Contributor

@skattoju It looks like there is still a sanity failure. I do expect the go-apidiff failure though.

@everettraven

everettraven commented Sep 10, 2024

Copy link
Copy Markdown
Contributor

Looks like the sanity failure is due to the newly added types documentation

@skattoju
skattojuforce-pushed the desc_upgradeconstraintpolicy branch from f6da41e to 514c1a2CompareSeptember 10, 2024 13:58
@skattoju

skattoju commented Sep 10, 2024

Copy link
Copy Markdown
ContributorAuthor

looks like sanity is passing after doing make verify and committing changes to docs/refs/api/operator-controller-api-reference.md 👍

joelanford
joelanford reviewed Sep 11, 2024
View reviewed changes
Comment threadinternal/resolve/catalog_test.go Outdated
joelanford
joelanford reviewed Sep 11, 2024
View reviewed changes
Comment threadinternal/resolve/catalog_test.go Outdated
joelanford
joelanford reviewed Sep 11, 2024
View reviewed changes
Comment threadinternal/resolve/catalog_test.go Outdated
@skattoju@joelanford
change match labels to olm.operatorframework.io/metadata.name
8f9b615
fix unintentional override due to error in rebase
Co-authored-by: Joe Lanford <joe.lanford@gmail.com>
LalatenduMohanty
LalatenduMohanty approved these changes Sep 11, 2024
View reviewed changes

@LalatenduMohantyLalatenduMohanty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2024
@joelanford
joelanford added this pull request to the merge queue Sep 11, 2024
Merged via the queue into operator-framework:main with commit 78a6c00Sep 11, 2024
@skattojuskattoju mentioned this pull request Sep 25, 2024
Merged
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joelanfordjoelanfordjoelanford approved these changes
@LalatenduMohantyLalatenduMohantyLalatenduMohanty approved these changes
+1 more reviewer
@everettraveneverettraveneverettraven left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@LalatenduMohantyLalatenduMohanty

Labels

lgtmIndicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update the allowed values of the ClusterExtension.Spec.UpgradeConstraintPolicy to be more descriptive

4 participants

@skattoju@LalatenduMohanty@everettraven@joelanford