Skip to content

OPRUN-2913: Downstream sync#480

Closed
tmshort wants to merge 12 commits into
openshift:masterfrom
tmshort:downstream-sync
Closed

OPRUN-2913: Downstream sync#480
tmshort wants to merge 12 commits into
openshift:masterfrom
tmshort:downstream-sync

Conversation

@tmshort

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

Copy link
Copy Markdown
Contributor

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 <brad@redhat.com>

Signed-off-by: Brad P. Crochet <brad@redhat.com>
Upstream-repository: api
Upstream-commit: 5f99430d4ec47d59daafa3b818229f0466531dea
@grokspawn @tmshort
introduce spec.runAsRoot field (openshift#258)
601b835 
Signed-off-by: Jordan <jordan@nimblewidget.com>

Signed-off-by: Jordan <jordan@nimblewidget.com>
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 <timflannagan@gmail.com>
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 <timflannagan@gmail.com>

Signed-off-by: timflannagan <timflannagan@gmail.com>
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 <timflannagan@gmail.com>
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 v4@v4.28.1

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 <bpalmer@redhat.com>

* update validation logic

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* remove debug statements

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Upstream-repository: api
Upstream-commit: b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4
@grokspawn @tmshort
adding grokspawn to tide owners file (openshift#268)
a7c1900 
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
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 <bpalmer@redhat.com>

* update warning and error checks to use a map

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
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] <support@github.com>
@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

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

Copy link
Copy Markdown

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

Details

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

openshift-ci Bot commented Apr 6, 2023

Copy link
Copy Markdown
Contributor

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

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

Copy link
Copy Markdown

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

Details

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

Copy link
Copy Markdown
Contributor

[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.

Details 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

tmshort commented Apr 6, 2023

Copy link
Copy Markdown
Contributor Author

/test all

@tmshort

tmshort commented Apr 6, 2023

Copy link
Copy Markdown
Contributor Author

/test verify

@tmshort

tmshort commented Apr 6, 2023

Copy link
Copy Markdown
Contributor Author

/test verify

@tmshort

tmshort commented Apr 6, 2023

Copy link
Copy Markdown
Contributor Author

/test all

@tmshort

tmshort commented Apr 11, 2023

Copy link
Copy Markdown
Contributor Author

/retest

3 similar comments
@tmshort

tmshort commented Apr 11, 2023

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Apr 11, 2023

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Apr 12, 2023

Copy link
Copy Markdown
Contributor Author

/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

tmshort commented Apr 12, 2023

Copy link
Copy Markdown
Contributor Author

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

@tmshort

tmshort commented Apr 12, 2023

Copy link
Copy Markdown
Contributor Author

/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

tmshort commented Apr 13, 2023

Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@tmshort

tmshort commented Apr 13, 2023

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Apr 13, 2023

Copy link
Copy Markdown
Contributor

@tmshort: all tests passed!

Full PR test history. Your PR dashboard.

Details

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
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Mar 27, 2026
@dependabot
Bump sigs.k8s.io/controller-runtime in the k8s-dependencies group (op…
f43b63a 
…enshift#480)

Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

Updates `sigs.k8s.io/controller-runtime` from 0.23.1 to 0.23.3
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.23.1...v0.23.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.23.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: api
Upstream-commit: 2b3f0881755f21efb48ce421a26c63d0f3239785
@openshift-bot openshift-bot mentioned this pull request Mar 27, 2026
Merged
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Mar 29, 2026
@dependabot
Bump sigs.k8s.io/controller-runtime in the k8s-dependencies group (op…
0e59533 
…enshift#480)

Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

Updates `sigs.k8s.io/controller-runtime` from 0.23.1 to 0.23.3
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.23.1...v0.23.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.23.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: api
Upstream-commit: 2b3f0881755f21efb48ce421a26c63d0f3239785
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