Skip to content

OCPBUGS-48294: (Manual) Synchronize From Upstream Repositories #216

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 45 commits into from
Jan 8, 2025

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Jan 8, 2025

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

Date Commit Author Message
2025-01-07 22:11:39 operator-framework/operator-controller@5b5ccab Todd Short Update catalogd to v1.1.0 (#1553)
upstream commit list

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

Date Commit Author Message
2025-01-06 11:36:55 openshift/operator-framework-operator-controller@b3f6af1 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@4c69d7c Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@c850c4b AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@1405c02 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@bae5f4d Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@e001e1c Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@fcc2e64 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@96a01e2 Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@7d2ed01 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@88a2462 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@0a1d865 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@e38dfd4 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@9c14cc5 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@7ca3c22 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@6c86607 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@ae55b79 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@f7c7fc9 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-01-06 11:38:51 openshift/operator-framework-operator-controller@f26d8e2 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-01-06 11:42:11 openshift/operator-framework-operator-controller@6f12a85 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-01-06 11:42:38 openshift/operator-framework-operator-controller@9dc03ee Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@657169b Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@67e5f40 Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-01-06 11:42:58 openshift/operator-framework-operator-controller@c508578 dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-01-06 11:43:33 openshift/operator-framework-operator-controller@95ace89 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@5555857 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@68b3859 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@9a1b812 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@f0d170b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
2025-01-06 12:08:45 openshift/operator-framework-operator-controller@c0b0ccc Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert

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
/label tide/merge-method-merge
/label kind/sync

dependabot bot and others added 30 commits January 7, 2025 01:43
Bumps [charset-normalizer](https://github.com/jawah/charset_normalizer) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/jawah/charset_normalizer/releases)
- [Changelog](https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md)
- [Commits](jawah/charset_normalizer@3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: charset-normalizer
  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>
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.12 to 10.13.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.12...10.13)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.2.3...2.3.0)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  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>
Bumps [click](https://github.com/pallets/click) from 8.1.7 to 8.1.8.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](pallets/click@8.1.7...8.1.8)

---
updated-dependencies:
- dependency-name: click
  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>
…1545)

Co-authored-by: Artur Zych <5843875+azych@users.noreply.github.com>
…improve logging (#1547)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
…e-bundles hack script (#1546)

Co-authored-by: Artur Zych <5843875+azych@users.noreply.github.com>
Bumps [pygments](https://github.com/pygments/pygments) from 2.18.0 to 2.19.1.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.18.0...2.19.1)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
go: upgraded golang.org/x/crypto v0.31.0 => v0.32.0
go: upgraded golang.org/x/net v0.30.0 => v0.34.0
go: upgraded golang.org/x/sys v0.28.0 => v0.29.0
go: upgraded golang.org/x/term v0.27.0 => v0.28.0
Signed-off-by: Todd Short <tshort@redhat.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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 8, 2025
@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
2025-01-07 22:11:39 operator-framework/operator-controller@5b5ccab Todd Short Update catalogd to v1.1.0 (#1553)
upstream commit list

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

Date Commit Author Message
2025-01-06 11:36:55 openshift/operator-framework-operator-controller@b3f6af1 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@4c69d7c Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@c850c4b AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@1405c02 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@bae5f4d Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@e001e1c Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@fcc2e64 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@96a01e2 Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@7d2ed01 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@88a2462 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@0a1d865 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@e38dfd4 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@9c14cc5 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@7ca3c22 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@6c86607 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@ae55b79 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@f7c7fc9 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-01-06 11:38:51 openshift/operator-framework-operator-controller@f26d8e2 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-01-06 11:42:11 openshift/operator-framework-operator-controller@6f12a85 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-01-06 11:42:38 openshift/operator-framework-operator-controller@9dc03ee Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@657169b Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@67e5f40 Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-01-06 11:42:58 openshift/operator-framework-operator-controller@c508578 dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-01-06 11:43:33 openshift/operator-framework-operator-controller@95ace89 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@5555857 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@68b3859 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@9a1b812 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@f0d170b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
2025-01-06 12:08:45 openshift/operator-framework-operator-controller@c0b0ccc Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert

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
/label tide/merge-method-merge
/label kind/sync

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 openshift-ci bot added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Jan 8, 2025
Copy link
Contributor

openshift-ci bot commented Jan 8, 2025

@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
2025-01-07 22:11:39 operator-framework/operator-controller@5b5ccab Todd Short Update catalogd to v1.1.0 (#1553)
upstream commit list

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

Date Commit Author Message
2025-01-06 11:36:55 openshift/operator-framework-operator-controller@b3f6af1 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@4c69d7c Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@c850c4b AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@1405c02 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@bae5f4d Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@e001e1c Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@fcc2e64 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@96a01e2 Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@7d2ed01 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@88a2462 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@0a1d865 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@e38dfd4 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@9c14cc5 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@7ca3c22 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@6c86607 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@ae55b79 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@f7c7fc9 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-01-06 11:38:51 openshift/operator-framework-operator-controller@f26d8e2 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-01-06 11:42:11 openshift/operator-framework-operator-controller@6f12a85 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-01-06 11:42:38 openshift/operator-framework-operator-controller@9dc03ee Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@657169b Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@67e5f40 Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-01-06 11:42:58 openshift/operator-framework-operator-controller@c508578 dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-01-06 11:43:33 openshift/operator-framework-operator-controller@95ace89 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@5555857 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@68b3859 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@9a1b812 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@f0d170b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
2025-01-06 12:08:45 openshift/operator-framework-operator-controller@c0b0ccc Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert

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
/label tide/merge-method-merge
/label kind/sync

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 Jan 8, 2025

@tmshort: The label(s) /label kind/sync cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

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

Date Commit Author Message
2025-01-07 22:11:39 operator-framework/operator-controller@5b5ccab Todd Short Update catalogd to v1.1.0 (#1553)
upstream commit list

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

Date Commit Author Message
2025-01-06 11:36:55 openshift/operator-framework-operator-controller@b3f6af1 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@4c69d7c Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@c850c4b AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@1405c02 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@bae5f4d Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@e001e1c Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@fcc2e64 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@96a01e2 Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@7d2ed01 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@88a2462 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@0a1d865 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@e38dfd4 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@9c14cc5 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@7ca3c22 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@6c86607 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@ae55b79 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@f7c7fc9 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-01-06 11:38:51 openshift/operator-framework-operator-controller@f26d8e2 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-01-06 11:42:11 openshift/operator-framework-operator-controller@6f12a85 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-01-06 11:42:38 openshift/operator-framework-operator-controller@9dc03ee Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@657169b Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@67e5f40 Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-01-06 11:42:58 openshift/operator-framework-operator-controller@c508578 dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-01-06 11:43:33 openshift/operator-framework-operator-controller@95ace89 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@5555857 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@68b3859 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@9a1b812 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@f0d170b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
2025-01-06 12:08:45 openshift/operator-framework-operator-controller@c0b0ccc Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert

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
/label tide/merge-method-merge
/label kind/sync

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 Jan 8, 2025

[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 Jan 8, 2025
@tmshort
Copy link
Contributor Author

tmshort commented Jan 8, 2025

This should be the equivalent of upstream v1.1.0

@joelanford
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit eb9caab into openshift:main Jan 8, 2025
8 of 9 checks passed
@tmshort tmshort deleted the synchronize branch January 8, 2025 19:19
@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.19.0-202501082041.p0.geb9caab.assembly.stream.el9.
All builds following this will include this PR.

@tmshort tmshort changed the title NO-ISSUE: (Manual) Synchronize From Upstream Repositories OCPBUGS-48294: (Manual) Synchronize From Upstream Repositories Jan 10, 2025
@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-48294 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

In response to this:

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

Date Commit Author Message
2025-01-07 22:11:39 operator-framework/operator-controller@5b5ccab Todd Short Update catalogd to v1.1.0 (#1553)
upstream commit list

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

Date Commit Author Message
2025-01-06 11:36:55 openshift/operator-framework-operator-controller@b3f6af1 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@4c69d7c Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-01-06 11:36:56 openshift/operator-framework-operator-controller@c850c4b AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@1405c02 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-01-06 11:36:57 openshift/operator-framework-operator-controller@bae5f4d Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@e001e1c Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-01-06 11:36:58 openshift/operator-framework-operator-controller@fcc2e64 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@96a01e2 Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-01-06 11:36:59 openshift/operator-framework-operator-controller@7d2ed01 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@88a2462 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:37:00 openshift/operator-framework-operator-controller@0a1d865 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@e38dfd4 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-01-06 11:38:33 openshift/operator-framework-operator-controller@9c14cc5 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@7ca3c22 AOS Automation Release Team UPSTREAM: <carry>: 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
2025-01-06 11:38:34 openshift/operator-framework-operator-controller@6c86607 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@ae55b79 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-01-06 11:38:50 openshift/operator-framework-operator-controller@f7c7fc9 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-01-06 11:38:51 openshift/operator-framework-operator-controller@f26d8e2 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-01-06 11:42:11 openshift/operator-framework-operator-controller@6f12a85 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-01-06 11:42:38 openshift/operator-framework-operator-controller@9dc03ee Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@657169b Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-01-06 11:42:57 openshift/operator-framework-operator-controller@67e5f40 Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-01-06 11:42:58 openshift/operator-framework-operator-controller@c508578 dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-01-06 11:43:33 openshift/operator-framework-operator-controller@95ace89 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@5555857 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-01-06 11:43:34 openshift/operator-framework-operator-controller@68b3859 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@9a1b812 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-01-06 11:43:35 openshift/operator-framework-operator-controller@f0d170b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml
2025-01-06 12:08:45 openshift/operator-framework-operator-controller@c0b0ccc Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert

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
/label tide/merge-method-merge
/label kind/sync

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.

@tmshort
Copy link
Contributor Author

tmshort commented Jan 10, 2025

/jira refresh

@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-48294: All pull requests linked via external trackers have merged:

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

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 openshift-eng/jira-lifecycle-plugin 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-reference Indicates that this PR references a valid Jira ticket of any type. kind/sync 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.