Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

providing a constraint property constant for dependency consistency #1282

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

grokspawn
Copy link
Contributor

@grokspawn grokspawn commented Apr 24, 2024

Description of the change:
add a convenience type for olm.constraint family of dependencies for consistent approach to dependency detection

Motivation for the change:
working in pursuit of operator-framework/operator-controller#779 identified that there are not constant types to represent all the dependency types in one place. This should help make operator-framework/operator-controller#781 cleaner.

They are currently divided across

  1. alpha/property/property.go (for package/gvk); and
  2. pkg/registry/types.go (for constraint)

This appears to be for a few reasons:

  1. operator-registry doesn't enforce/convert olm.constraint; it's deferred until olm's resolver
  2. operator-lifecycle-manager uses bare "olm.constraint" strings instead of using a const type
  3. in alpha/property/property.go Parse() this property passes as opaque json.RawMessage type via the default case since it has no dedicated storage type in this context.

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

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2024
Copy link
Contributor

@perdasilva perdasilva left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

openshift-ci bot commented Apr 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, m1kola, perdasilva

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [grokspawn,perdasilva]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@perdasilva
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 25, 2024
Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.02%. Comparing base (aa0777c) to head (de1f5fa).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1282   +/-   ##
=======================================
  Coverage   54.02%   54.02%           
=======================================
  Files         108      108           
  Lines       11266    11266           
=======================================
  Hits         6087     6087           
  Misses       4190     4190           
  Partials      989      989           

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

@perdasilva perdasilva added this pull request to the merge queue Apr 25, 2024
Merged via the queue into operator-framework:master with commit bc9a5c2 Apr 25, 2024
12 checks passed
@grokspawn grokspawn deleted the constraint-type branch April 25, 2024 12:28
renovate bot added a commit to registry-operator/registry-operator that referenced this pull request Apr 26, 2024
…try to v1.40.0 (#36)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/operator-framework/operator-registry](https://togithub.com/operator-framework/operator-registry)
| `v1.39.0` -> `v1.40.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2foperator-framework%2foperator-registry/v1.40.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2foperator-framework%2foperator-registry/v1.40.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2foperator-framework%2foperator-registry/v1.39.0/v1.40.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2foperator-framework%2foperator-registry/v1.39.0/v1.40.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>operator-framework/operator-registry
(github.com/operator-framework/operator-registry)</summary>

###
[`v1.40.0`](https://togithub.com/operator-framework/operator-registry/releases/tag/v1.40.0)

[Compare
Source](https://togithub.com/operator-framework/operator-registry/compare/v1.39.0...v1.40.0)

#### What's Changed

- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1250
- build(deps): bump sigs.k8s.io/kind from 0.20.0 to 0.22.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1249
- build(deps): bump github.com/containers/image/v5 from 5.29.0 to 5.30.0
by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1253
- build(deps): bump github.com/containerd/containerd from 1.7.11 to
1.7.14 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1252
- build(deps): bump github.com/docker/cli from 25.0.5+incompatible to
26.0.0+incompatible by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1251
- build(deps): bump github.com/onsi/gomega from 1.31.1 to 1.32.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1254
- build(deps): bump github.com/joelanford/ignore from
0.0.0-20210607151042-0d25dc18b62d to 0.1.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1258
- build(deps): bump google.golang.org/grpc from 1.61.1 to 1.62.1 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1257
- build(deps): bump github.com/containers/common from 0.57.1 to 0.58.1
by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1256
- build(deps): bump github.com/grpc-ecosystem/grpc-health-probe from
0.4.24 to 0.4.25 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1255
- build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1260
- build(deps): bump golang.org/x/mod from 0.16.0 to 0.17.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1261
- build(deps): bump golang.org/x/sys from 0.18.0 to 0.19.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1262
- build(deps): bump golang.org/x/net from 0.22.0 to 0.24.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1263
- build(deps): bump golang.org/x/sync from 0.6.0 to 0.7.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1264
- build(deps): bump sigs.k8s.io/controller-runtime from 0.17.2 to 0.17.3
by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1266
- build(deps): bump google.golang.org/grpc from 1.63.0 to 1.63.2 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1267
- build(deps): bump github.com/containerd/containerd from 1.7.14 to
1.7.15 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1265
- build(deps): bump github.com/docker/cli from 26.0.0+incompatible to
26.0.1+incompatible by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1268
- build(deps): bump github.com/containers/common from 0.58.1 to 0.58.2
by [@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1269
- pkg/cache: set explicit mode to handle upcoming go1.22 defaulting in
fstest.MapFS by [@&#8203;joelanford](https://togithub.com/joelanford) in
[operator-framework/operator-registry#1279
- build(deps): bump github.com/onsi/gomega from 1.32.0 to 1.33.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[operator-framework/operator-registry#1280
- providing a constraint property constant for dependency consistency by
[@&#8203;grokspawn](https://togithub.com/grokspawn) in
[operator-framework/operator-registry#1282

**Full Changelog**:
operator-framework/operator-registry@v1.39.0...v1.40.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/registry-operator/registry-operator).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMjEuMiIsInVwZGF0ZWRJblZlciI6IjM3LjMyMS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJhcmVhL2RlcGVuZGVuY3kiXX0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants