Skip to content

OLM-2726, OCPBUGS-643: downstreaming opm serve changes from operator-registry #374

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

Merged
merged 3 commits into from
Sep 1, 2022

Conversation

grokspawn
Copy link
Contributor

including two commits which seem to be of equal priority to pipeline:

When we fatally exit directly in the serve functions, we do not give a
chance for the registered cleanup functions to run, resulting in
temporary files being left behind.

This commit ensures that we always cleanly return an error from the
serve function, thus ensuring that defered cleanups always happen.

Signed-off-by: Joe Lanford <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 215f413e76e3fb544b0d450acdbab41c756dbf59
* opm serve: use pre-existing cache, if set and up-to-date

Signed-off-by: Joe Lanford <[email protected]>

* refactor to leave NewQuerier function untouched

Signed-off-by: Joe Lanford <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 215f413e76e3fb544b0d450acdbab41c756dbf59
@grokspawn
Copy link
Contributor Author

/retest-required

@grokspawn
Copy link
Contributor Author

/jira refresh

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 26, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD 11644a5 and 8 for PR HEAD b94e073 in total

@perdasilva
Copy link
Contributor

/hold for qe-review

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 26, 2022
@Xia-Zhao-rh
Copy link

Hi, @grokspawn
I tested it, but failed.
catsrc is not ready due to "compute digest: compute hash: write tar: open /tmp/cache/cache: permission denied"
Please check detail information in bellow jira:
https://issues.redhat.com/browse/OCPBUGS-643
Thanks

* fix permissions problems with pregen cache access
* constant replacement

Signed-off-by: Jordan <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: ce3bb44f7618726474a78f95852e30a2bfb0346a
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2022
@grokspawn grokspawn changed the title OLM-2726: downstreaming opm serve changes from operator-registry OLM-2726, OCPBUGS-650: downstreaming opm serve changes from operator-registry Aug 31, 2022
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 31, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-650, which is invalid:

  • expected the bug to target the "4.12.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

including two commits which seem to be of equal priority to pipeline:

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.

@grokspawn
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 31, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-650, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

In response to this:

/jira refresh

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.

@grokspawn
Copy link
Contributor Author

grokspawn commented Aug 31, 2022

I included the upstream fix for the related bug in this since the functionality is a logical whole.

@grokspawn grokspawn changed the title OLM-2726, OCPBUGS-650: downstreaming opm serve changes from operator-registry OLM-2726, OCPBUGS-643: downstreaming opm serve changes from operator-registry Aug 31, 2022
@openshift-ci-robot openshift-ci-robot removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 31, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-643, which is invalid:

  • expected the bug to target the "4.12.0" version, but it targets "premerge" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

including two commits which seem to be of equal priority to pipeline:

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.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 31, 2022
@grokspawn
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-643, which is invalid:

  • expected the bug to target only the "4.12.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@grokspawn
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 31, 2022
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-643, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

In response to this:

/jira refresh

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2022

@grokspawn: 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.

@Xia-Zhao-rh
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 1, 2022
@Xia-Zhao-rh
Copy link

/hold for qe-review

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, timflannagan

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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2022
@perdasilva
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2022
@openshift-merge-robot openshift-merge-robot merged commit d817e09 into openshift:master Sep 1, 2022
@openshift-ci-robot
Copy link

@grokspawn: All pull requests linked via external trackers have merged:

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

In response to this:

including two commits which seem to be of equal priority to pipeline:

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.

@grokspawn
Copy link
Contributor Author

/cherrypick release-4.11

@openshift-cherrypick-robot

@grokspawn: #374 failed to apply on top of branch "release-4.11":

Applying: do not fatally exit from serve commands (#1016)
Using index info to reconstruct a base tree...
M	staging/operator-registry/cmd/opm/serve/serve.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/serve/serve.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-registry/cmd/opm/serve/serve.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/cmd/opm/serve/serve.go
Auto-merging staging/operator-registry/cmd/opm/serve/serve.go
CONFLICT (content): Merge conflict in staging/operator-registry/cmd/opm/serve/serve.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 do not fatally exit from serve commands (#1016)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.11

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.

perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Jan 15, 2025
Bumps [github.com/google/cel-go](https://github.com/google/cel-go) from 0.22.0 to 0.22.1.
- [Release notes](https://github.com/google/cel-go/releases)
- [Commits](google/cel-go@v0.22.0...v0.22.1)

---
updated-dependencies:
- dependency-name: github.com/google/cel-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: api
Upstream-commit: 47eb57aabb155b9c71627c7117ffeab650ae5b9d
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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants