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

OCPBUGS-17157: sync #531

Merged

Conversation

stevekuznetsov
Copy link
Contributor

No description provided.

kevinrizza and others added 7 commits August 3, 2023 11:43
Signed-off-by: kevinrizza <krizza@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 82fab49ef724a060090b8fc65f714724351b16b7
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* fixes operator-framework/operator-sdk#5995

* fix comment change

* fix imports

Upstream-repository: api
Upstream-commit: fdfcb35e6d330fca94841b113c8140cf58930e35
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
We do not want to fail the job if codecov fails
to upload the report due to rate limiting.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Upstream-repository: api
Upstream-commit: 92e43415eb8799b2733cc2a98e667e0e7e8d39b8
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: a71ca092204961ad1ede3db1079a7ac50439a1c3
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.1+incompatible to 23.0.3+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v23.0.1...v23.0.3)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: a7e3f3fba29a6b65695a96cc073a077f0058ab84

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
We want to use a partial object metadata query for CSVs to reduce
resource utilization. We still want to ask questions about whether these
CSVs are copied, so we need to refactor this method to take only object
metadata. While it's not a perfect port of the previous logic, it defies
explanation how an object would have all the other markings of being
copied but the wrong status.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: api
Upstream-commit: 409ec70c6c889945acb0447397305aa5c2150ea2
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
…penshift#288)

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: api
Upstream-commit: 704ae942c4a9a33a3326a7da9364bc59f20ae532
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov stevekuznetsov changed the title sync OCPBUGS-17157: sync Aug 3, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Aug 3, 2023
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-17157, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

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.

…004)

* go.mod: update operator-framework/api

   $ GOPROXY=direct go get github.com/operator-framework/api@master
   $ GOPROXY=direct go mod tidy
   $ GOPROXY=direct go mod vendor
   $ make gen-all

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

* registry: implement memory targets on gRPC servers

This commit implements the GoDoc on the new CatalogSource field, adding
memory requests, limits and $GOMEMLIMIT values for sources that opt into
a memory target.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

---------

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 2c3928ec460a9354cb8d840da92d90900075e94d
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@joelanford
Copy link
Member

Btw, this PR should not merge until the memoryTarget API and implementation exist downstream.

My guess (hope) is that the e2e's here will fail until we've done that.

@stevekuznetsov
Copy link
Contributor Author

It depends on what the server does with unknown fields on the CatalogSource API - it's backwards compatible so likely the fields will just be ignored on versions of the server that don't understand them. That being said, while it's likely safe to merge before, no need to do it.

@stevekuznetsov
Copy link
Contributor Author

@joelanford I think your comment (and my response) are actually for operator-framework/operator-marketplace#527

@stevekuznetsov
Copy link
Contributor Author

/retest

1 similar comment
@perdasilva
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 4, 2023

@stevekuznetsov: all tests passed!

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.

@awgreene
Copy link
Contributor

awgreene commented Aug 4, 2023

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2023
Copy link
Contributor

@tmshort tmshort left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 4, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, stevekuznetsov, tmshort

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:

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

@openshift-merge-robot openshift-merge-robot merged commit f5fb02c into openshift:master Aug 4, 2023
12 checks passed
@openshift-ci-robot
Copy link

@stevekuznetsov: Jira Issue OCPBUGS-17157: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-17157 has not been moved to the MODIFIED state.

In response to this:

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.

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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