Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #158

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 26 commits into from
Sep 30, 2024

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Sep 30, 2024

The downstream repository has been updated through the following upstream commit:

Date Commit Author Message
2024-09-27 19:28:08 operator-framework/operator-controller@f169414 Joe Lanford follow-ups for containers/image from catalogd and previous PR (#1270)
upstream commit list

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2024-09-27 00:05:36 openshift/operator-framework-operator-controller@0f8b8c3 dtfranz UPSTREAM: : Add OpenShift specific files
2024-09-27 00:05:37 openshift/operator-framework-operator-controller@bb14af7 Alexander Greene UPSTREAM: : Drop commitchecker
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@736de31 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@3b35f7f Mikalai Radchuk UPSTREAM: : update owners
2024-09-27 00:05:39 openshift/operator-framework-operator-controller@92d35d4 Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-09-27 00:05:40 openshift/operator-framework-operator-controller@ada1b79 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@eebd175 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@9c4360d Mikalai Radchuk UPSTREAM: : Enable Validating Admission Policy APIs downstream
2024-09-27 00:05:42 openshift/operator-framework-operator-controller@c4c56d9 Ilias Rinis UPSTREAM: : manifests: set required-scc for openshift workloads
2024-09-27 00:05:43 openshift/operator-framework-operator-controller@9f2f9bd AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
2024-09-27 00:05:44 openshift/operator-framework-operator-controller@63d7f5b everettraven UPSTREAM: : add everettraven to approvers+reviewers
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@0431b73 everettraven UPSTREAM: : add openshift kustomize overlay
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@258b025 Todd Short UPSTREAM: : Add tmshort to approvers
2024-09-27 00:05:46 openshift/operator-framework-operator-controller@76641b1 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@9457e2f Todd Short UPSTREAM: : Properly copy and call kustomize
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@f32359a Joe Lanford UPSTREAM: : manifests: add hostPath mount for /etc/containers
2024-09-27 00:05:48 openshift/operator-framework-operator-controller@12f2384 dtfranz UPSTREAM: : Add test-e2e target for downstream Makefile to be run by openshift/release.

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

dependabot bot and others added 26 commits September 27, 2024 08:07
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.10.1 to 10.10.2.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.10.1...10.10.2)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: Update generate-manifests to handle new directory

The `default` directory was renamed `base`.

Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
* Remove alumni from owners
* Add m1kola to approvers

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
* This reverts commit 3f079c4.
* Includes Validating Admission Policy manifests

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Signed-off-by: everettraven <everettraven@gmail.com>
to enable TLS communication with catalogd. Configure the CA certs
using the configmap injection method via service-ca-operator

Signed-off-by: everettraven <everettraven@gmail.com>
Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS

Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
…run by openshift/release.

Signed-off-by: dtfranz <dfranz@redhat.com>
@openshift-ci-robot
Copy link

@tmshort: This pull request explicitly references no jira issue.

In response to this:

The downstream repository has been updated through the following upstream commit:

Date Commit Author Message
2024-09-27 19:28:08 operator-framework/operator-controller@f169414 Joe Lanford follow-ups for containers/image from catalogd and previous PR (#1270)
upstream commit list

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2024-09-27 00:05:36 openshift/operator-framework-operator-controller@0f8b8c3 dtfranz UPSTREAM: : Add OpenShift specific files
2024-09-27 00:05:37 openshift/operator-framework-operator-controller@bb14af7 Alexander Greene UPSTREAM: : Drop commitchecker
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@736de31 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@3b35f7f Mikalai Radchuk UPSTREAM: : update owners
2024-09-27 00:05:39 openshift/operator-framework-operator-controller@92d35d4 Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-09-27 00:05:40 openshift/operator-framework-operator-controller@ada1b79 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@eebd175 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@9c4360d Mikalai Radchuk UPSTREAM: : Enable Validating Admission Policy APIs downstream
2024-09-27 00:05:42 openshift/operator-framework-operator-controller@c4c56d9 Ilias Rinis UPSTREAM: : manifests: set required-scc for openshift workloads
2024-09-27 00:05:43 openshift/operator-framework-operator-controller@9f2f9bd AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
2024-09-27 00:05:44 openshift/operator-framework-operator-controller@63d7f5b everettraven UPSTREAM: : add everettraven to approvers+reviewers
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@0431b73 everettraven UPSTREAM: : add openshift kustomize overlay
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@258b025 Todd Short UPSTREAM: : Add tmshort to approvers
2024-09-27 00:05:46 openshift/operator-framework-operator-controller@76641b1 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@9457e2f Todd Short UPSTREAM: : Properly copy and call kustomize
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@f32359a Joe Lanford UPSTREAM: : manifests: add hostPath mount for /etc/containers
2024-09-27 00:05:48 openshift/operator-framework-operator-controller@12f2384 dtfranz UPSTREAM: : Add test-e2e target for downstream Makefile to be run by openshift/release.

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 30, 2024
Copy link
Contributor

openshift-ci bot commented Sep 30, 2024

@tmshort: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

The downstream repository has been updated through the following upstream commit:

Date Commit Author Message
2024-09-27 19:28:08 operator-framework/operator-controller@f169414 Joe Lanford follow-ups for containers/image from catalogd and previous PR (#1270)
upstream commit list

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2024-09-27 00:05:36 openshift/operator-framework-operator-controller@0f8b8c3 dtfranz UPSTREAM: : Add OpenShift specific files
2024-09-27 00:05:37 openshift/operator-framework-operator-controller@bb14af7 Alexander Greene UPSTREAM: : Drop commitchecker
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@736de31 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-09-27 00:05:38 openshift/operator-framework-operator-controller@3b35f7f Mikalai Radchuk UPSTREAM: : update owners
2024-09-27 00:05:39 openshift/operator-framework-operator-controller@92d35d4 Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-09-27 00:05:40 openshift/operator-framework-operator-controller@ada1b79 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@eebd175 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml
2024-09-27 00:05:41 openshift/operator-framework-operator-controller@9c4360d Mikalai Radchuk UPSTREAM: : Enable Validating Admission Policy APIs downstream
2024-09-27 00:05:42 openshift/operator-framework-operator-controller@c4c56d9 Ilias Rinis UPSTREAM: : manifests: set required-scc for openshift workloads
2024-09-27 00:05:43 openshift/operator-framework-operator-controller@9f2f9bd AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
2024-09-27 00:05:44 openshift/operator-framework-operator-controller@63d7f5b everettraven UPSTREAM: : add everettraven to approvers+reviewers
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@0431b73 everettraven UPSTREAM: : add openshift kustomize overlay
2024-09-27 00:05:45 openshift/operator-framework-operator-controller@258b025 Todd Short UPSTREAM: : Add tmshort to approvers
2024-09-27 00:05:46 openshift/operator-framework-operator-controller@76641b1 AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@9457e2f Todd Short UPSTREAM: : Properly copy and call kustomize
2024-09-27 00:05:47 openshift/operator-framework-operator-controller@f32359a Joe Lanford UPSTREAM: : manifests: add hostPath mount for /etc/containers
2024-09-27 00:05:48 openshift/operator-framework-operator-controller@12f2384 dtfranz UPSTREAM: : Add test-e2e target for downstream Makefile to be run by openshift/release.

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-sigs/prow repository.

Copy link
Contributor

openshift-ci bot commented Sep 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2024
@tmshort
Copy link
Contributor Author

tmshort commented Sep 30, 2024

/label tide/merge-method-merge

@openshift-ci openshift-ci bot added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Sep 30, 2024
@joelanford
Copy link
Member

/lgtm

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

openshift-ci bot commented Sep 30, 2024

@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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 3467fa5 into openshift:main Sep 30, 2024
9 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-operator-controller
This PR has been included in build ose-olm-operator-controller-container-v4.18.0-202409302039.p0.g3467fa5.assembly.stream.el9.
All builds following this will include this PR.

@tmshort tmshort deleted the synchronize branch October 11, 2024 19:45
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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants