Skip to content

OPRUN-2913: Downstream sync #480

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 12 commits into from
Closed

OPRUN-2913: Downstream sync #480

wants to merge 12 commits into from

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Apr 6, 2023 •
edited by openshift-ci bot
Loading

Downstream sync from the operator-framework/api repo through PR277.
PR278 is a bump to k8s 1.26, so it will need to be done later.

No Jira was made for these, so I'm using the OPRUN-2913 downstreaming ticket.

bcrochet and others added 11 commits April 6, 2023 09:55
@bcrochet @tmshort
Fix a panic when reading annotations if the bundle is not there (open…
9761cdc 
…shift#255)

If the bundle is not present, the current bundleLoader will panic
when it gets to addChannelsFromAnnotationsFile. If the bundle is
nil, addChannelsFromAnnotationsFile should not attempt to do anything
so instead it just returns now.

Signed-off-by: Brad P. Crochet <[email protected]>

Signed-off-by: Brad P. Crochet <[email protected]>
Upstream-repository: api
Upstream-commit: 5f99430d4ec47d59daafa3b818229f0466531dea
@grokspawn @tmshort
introduce spec.runAsRoot field (openshift#258)
601b835 
Signed-off-by: Jordan <[email protected]>

Signed-off-by: Jordan <[email protected]>
Upstream-repository: api
Upstream-commit: 7339a22050af53df7b6f97a652b8e2d73698765a
@laxmikantbpandhare @tmshort
bump k8s to 1.25 and go to 1.19 (openshift#260)
f628489 
updated

format

defs

Upstream-repository: api
Upstream-commit: ff2dbc53d3817df9b62a83dbe83cb221e7c043f4
@timflannagan @tmshort
Makefile: Remove the -v go mod tidy flag to fix the verify check (ope…
5ccb8a7 
…nshift#262)

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: 72295edd2bb11d414a1db6d6643fe3f3918c5ae4
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
e5df317 
…enshift#264)

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

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
@timflannagan @tmshort
crds,Makefile: Bump controller-tools version to v0.9.0 (openshift#263)
d9f7ac1 
Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: 4d4ed5a299506cab8898036a873031e6faa4b0fd
@anik120 @tmshort
(makefile) Upgrade mikefarah/yq to v4 (openshift#267)
8cafd67 
This PR upgrades the version of yq used in the makefile from
v3@latest to [email protected]

Upstream-repository: api
Upstream-commit: b527a19c8e14e2249d5a5cdb88063cfb136fdafb
@everettraven @tmshort
update k8s 1.25 validation logic (openshift#270)
79b5adc 
* update k8s 1.25 validation logic

to look for deprecated k8s APIs in various CSV fields

Signed-off-by: Bryce Palmer <[email protected]>

* update validation logic

Signed-off-by: Bryce Palmer <[email protected]>

* remove debug statements

Signed-off-by: Bryce Palmer <[email protected]>

Signed-off-by: Bryce Palmer <[email protected]>
Upstream-repository: api
Upstream-commit: b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4
@grokspawn @tmshort
adding grokspawn to tide owners file (openshift#268)
a7c1900 
Signed-off-by: Jordan Keister <[email protected]>

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: api
Upstream-commit: 028731a4f915f3a843634554ccc21d78b1d89859
@everettraven @tmshort
(bugfix): make k8s 1.25 validation logic check api group before issui…
b7ec23d 
…ng a warning (openshift#274)

* fix a bug in k8s 1.25 validation logic

to now check the apiGroup/resource to determine if an api is deprecated.

Signed-off-by: Bryce Palmer <[email protected]>

* update warning and error checks to use a map

Signed-off-by: Bryce Palmer <[email protected]>

Signed-off-by: Bryce Palmer <[email protected]>
Upstream-repository: api
Upstream-commit: f1b729684854a053f229464eb327527222188fd1
@dependabot @tmshort
build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 (openshift#277)
48bb3e7 
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.3.7...v0.3.8)

Upstream-repository: api
Upstream-commit: e8bb2e01756424cd3de5ec8521ef370623459cae

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 6, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 6, 2023 •
edited by openshift-ci bot
Loading

@tmshort: This pull request references OPRUN-2913 which is a valid jira issue.

In response to this:

Downstream sync from the operator-framework/api repo through PR277.
PR278 is a bump to k8s 1.26, so it will need to be done later.

No Jira was made for these, so I'm using the OPRUN-2913 downstreaming ticket.

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 openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 6, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 6, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 6, 2023 •
edited by openshift-ci bot
Loading

@tmshort: This pull request references OPRUN-2913 which is a valid jira issue.

In response to this:

Downstream sync from the operator-framework/api repo through PR277.
PR278 is a bump to k8s 1.26, so it will need to be done later.

No Jira was made for these, so I'm using the OPRUN-2913 downstreaming ticket.

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 Apr 6, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tmshort
Once this PR has been reviewed and has the lgtm label, please assign ankitathomas for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@tmshort
Copy link
Contributor Author

tmshort commented Apr 6, 2023

/test all

@tmshort
Copy link
Contributor Author

tmshort commented Apr 6, 2023

/test verify

@tmshort
Copy link
Contributor Author

tmshort commented Apr 6, 2023

/test verify

@tmshort
Copy link
Contributor Author

tmshort commented Apr 6, 2023

/test all

@tmshort
Copy link
Contributor Author

tmshort commented Apr 11, 2023

/retest

3 similar comments
@tmshort
Copy link
Contributor Author

tmshort commented Apr 11, 2023

/retest

@tmshort
Copy link
Contributor Author

tmshort commented Apr 11, 2023

/retest

@tmshort
Copy link
Contributor Author

tmshort commented Apr 12, 2023

/retest

@tmshort tmshort marked this pull request as ready for review April 12, 2023 17:24
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 12, 2023
@tmshort
Copy link
Contributor Author

tmshort commented Apr 12, 2023

Ugh... all tests pass and now I have to run them again :(

@tmshort
Copy link
Contributor Author

tmshort commented Apr 12, 2023

/retest
/hold

@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 Apr 12, 2023
@tmshort
Copy link
Contributor Author

tmshort commented Apr 13, 2023

/retest

1 similar comment
@tmshort
Copy link
Contributor Author

tmshort commented Apr 13, 2023

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 13, 2023

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

@tmshort tmshort closed this Jun 29, 2023
@tmshort tmshort deleted the downstream-sync branch October 23, 2023 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@tmshort @openshift-ci-robot @bcrochet @grokspawn @laxmikantbpandhare @timflannagan @anik120 @everettraven