Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #270

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 57 commits into from
Feb 17, 2025

Conversation

openshift-bot
Copy link

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

Date Commit Author Message
2025-02-14 19:43:51 operator-framework/operator-controller@7f00b13 Tayler Geiger Add documentation on setting up live debugging (#1653)
upstream commit list

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

Date Commit Author Message
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@4fdff7c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@1ebcce5 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-02-14 03:34:53 openshift/operator-framework-operator-controller@108c608 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-02-14 03:34:53 openshift/operator-framework-operator-controller@dd88323 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@b36f4c5 Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@946989e Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@96d7acd 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-02-14 03:34:55 openshift/operator-framework-operator-controller@334003f Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-02-14 03:34:55 openshift/operator-framework-operator-controller@440edbc Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-02-14 03:34:56 openshift/operator-framework-operator-controller@59fe590 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-02-14 03:34:56 openshift/operator-framework-operator-controller@8cd51fe everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@09a4255 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@8f41215 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-02-14 03:34:58 openshift/operator-framework-operator-controller@1600dfb 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-02-14 03:34:58 openshift/operator-framework-operator-controller@99eac20 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-02-14 03:34:59 openshift/operator-framework-operator-controller@4e2c56b Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@5f004c3 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@4e8f40c dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-02-14 03:35:01 openshift/operator-framework-operator-controller@8878255 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-02-14 03:35:02 openshift/operator-framework-operator-controller@d1f25ec Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@c70140e Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@8077fba Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-02-14 03:35:04 openshift/operator-framework-operator-controller@50fc05a dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-02-14 03:35:05 openshift/operator-framework-operator-controller@52f3ddd everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@307829c Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@d7a6854 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-02-14 03:35:07 openshift/operator-framework-operator-controller@09a39ce Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-02-14 03:35:08 openshift/operator-framework-operator-controller@5523ed7 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-02-14 03:35:09 openshift/operator-framework-operator-controller@c9cbfa6 Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert
2025-02-14 03:35:09 openshift/operator-framework-operator-controller@dfcc001 Todd Short UPSTREAM: <carry>: Add support for proxy trustedCAs
2025-02-14 03:35:10 openshift/operator-framework-operator-controller@37d16e8 Todd Short UPSTREAM: <carry>: Fix error to build the image
2025-02-14 03:35:11 openshift/operator-framework-operator-controller@3087436 Camila Macedo UPSTREAM: <carry>: Fix make verify for mac os envs
2025-02-14 03:35:12 openshift/operator-framework-operator-controller@711fae2 Camila Macedo UPSTREAM: <carry>: Move operator-controller openshift files to its own dir
2025-02-14 03:35:13 openshift/operator-framework-operator-controller@6201f11 Camila Macedo UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19
2025-02-14 03:35:15 openshift/operator-framework-operator-controller@0bb4971 Camila Macedo UPSTREAM: <carry>: Add Openshift's catalogd manifests
2025-02-14 03:35:16 openshift/operator-framework-operator-controller@274b815 Joe Lanford UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap
2025-02-14 03:35:18 openshift/operator-framework-operator-controller@0d3ea66 Todd Short UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments
2025-02-14 03:35:20 openshift/operator-framework-operator-controller@939bc73 Joe Lanford UPSTREAM: <carry>: fixup catalogd.Dockerfile paths
2025-02-14 03:35:22 openshift/operator-framework-operator-controller@24d8e73 Todd Short UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap
2025-02-14 03:35:24 openshift/operator-framework-operator-controller@3db665e Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:26 openshift/operator-framework-operator-controller@a264c15 Forrest Babcock UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations"
2025-02-14 03:35:28 openshift/operator-framework-operator-controller@789cbab Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:31 openshift/operator-framework-operator-controller@f337faa Todd Short UPSTREAM: <carry>: Remove vet from openshift verify
2025-02-14 03:35:34 openshift/operator-framework-operator-controller@3ea68d4 Todd Short UPSTREAM: <carry>: Skip another upstream test
2025-02-14 20:24:42 openshift/operator-framework-operator-controller@f1daf88 Camila Macedo UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests

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 30 commits February 14, 2025 09:25
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.17.0 to 3.17.1.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.17.0...v3.17.1)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  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>
* migrate operator-controller command handling to cobra

Signed-off-by: Omar Farag <[email protected]>

* remove deprecated version flag handling

Signed-off-by: Omar Farag <[email protected]>

* fix error handling, fix lint issues and tidy go.mod

Signed-off-by: Omar Farag <[email protected]>

---------

Signed-off-by: Omar Farag <[email protected]>
Adds an overlay that removes the liveness and readiness probes
as well as the --leader-elect flag from the operator-controller-controller-manager deployment since those will cause container restarts when the go debugger is stopped at breakpoints. Also edits the Tiltfile to use this new overlay target.

Also adds our 1 existing feature flag to the new overlay.

Signed-off-by: Tayler Geiger <[email protected]>
Do ctrl.SetLogger() in init()
Check klog.V(4).Enabled() in run() (after flags have been parsed)

Signed-off-by: Todd Short <[email protected]>
…ller` e2e (#1757)

- Removed `gingko` and `omega` from `unpack_test`.
- Ensured that `unpack_test` previously under `catalogd-e2e` is now executed alongside other `operator-controller` e2e tests.
Adds a short doc on how to set up breakpoints with VSCode through Tilt.
Also expands on the existing podman local environment document.

Signed-off-by: Tayler Geiger <[email protected]>
Signed-off-by: dtfranz <[email protected]>

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

The `default` directory was renamed `base`.

Signed-off-by: Todd Short <[email protected]>
* Remove alumni from owners
* Add m1kola to approvers

Signed-off-by: Mikalai Radchuk <[email protected]>
* This reverts commit 3f079c4.
* Includes Validating Admission Policy manifests

Signed-off-by: Mikalai Radchuk <[email protected]>
to enable TLS communication with catalogd. Configure the CA certs
using the configmap injection method via service-ca-operator

Signed-off-by: everettraven <[email protected]>
Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS

Signed-off-by: Todd Short <[email protected]>
Pass global-pull-secret to the manager container.

Signed-off-by: Mikalai Radchuk <[email protected]>
The /run/secrets/kubernetes.io/serviceaccount/ directory is projected
into the pod and contains the following CA certificates:

* configmap/kube-root-ca.crt as ca.crt
* configmap/openshift-service-ca.crt as service-ca.crt

Update the --ca-certs-dir argument to reference the directory.

Signed-off-by: Todd Short <[email protected]>
tmshort and others added 12 commits February 15, 2025 00:07
…alogd deployments

This allows for use of the any image.config.openshift.io trusted CAs

Signed-off-by: Todd Short <[email protected]>
…r CAs to avoid subPath limitations"

This reverts commit 548caa4.
The `vet` target was removed upstream.

Signed-off-by: Todd Short <[email protected]>
@openshift-bot openshift-bot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. kind/sync approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Feb 15, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 15, 2025
@openshift-ci-robot
Copy link

@openshift-bot: 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-02-14 19:43:51 operator-framework/operator-controller@7f00b13 Tayler Geiger Add documentation on setting up live debugging (#1653)
upstream commit list

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

Date Commit Author Message
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@4fdff7c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@1ebcce5 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-02-14 03:34:53 openshift/operator-framework-operator-controller@108c608 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-02-14 03:34:53 openshift/operator-framework-operator-controller@dd88323 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@b36f4c5 Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@946989e Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@96d7acd 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-02-14 03:34:55 openshift/operator-framework-operator-controller@334003f Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-02-14 03:34:55 openshift/operator-framework-operator-controller@440edbc Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-02-14 03:34:56 openshift/operator-framework-operator-controller@59fe590 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-02-14 03:34:56 openshift/operator-framework-operator-controller@8cd51fe everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@09a4255 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@8f41215 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-02-14 03:34:58 openshift/operator-framework-operator-controller@1600dfb 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-02-14 03:34:58 openshift/operator-framework-operator-controller@99eac20 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-02-14 03:34:59 openshift/operator-framework-operator-controller@4e2c56b Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@5f004c3 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@4e8f40c dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-02-14 03:35:01 openshift/operator-framework-operator-controller@8878255 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-02-14 03:35:02 openshift/operator-framework-operator-controller@d1f25ec Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@c70140e Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@8077fba Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-02-14 03:35:04 openshift/operator-framework-operator-controller@50fc05a dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-02-14 03:35:05 openshift/operator-framework-operator-controller@52f3ddd everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@307829c Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@d7a6854 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-02-14 03:35:07 openshift/operator-framework-operator-controller@09a39ce Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-02-14 03:35:08 openshift/operator-framework-operator-controller@5523ed7 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-02-14 03:35:09 openshift/operator-framework-operator-controller@c9cbfa6 Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert
2025-02-14 03:35:09 openshift/operator-framework-operator-controller@dfcc001 Todd Short UPSTREAM: <carry>: Add support for proxy trustedCAs
2025-02-14 03:35:10 openshift/operator-framework-operator-controller@37d16e8 Todd Short UPSTREAM: <carry>: Fix error to build the image
2025-02-14 03:35:11 openshift/operator-framework-operator-controller@3087436 Camila Macedo UPSTREAM: <carry>: Fix make verify for mac os envs
2025-02-14 03:35:12 openshift/operator-framework-operator-controller@711fae2 Camila Macedo UPSTREAM: <carry>: Move operator-controller openshift files to its own dir
2025-02-14 03:35:13 openshift/operator-framework-operator-controller@6201f11 Camila Macedo UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19
2025-02-14 03:35:15 openshift/operator-framework-operator-controller@0bb4971 Camila Macedo UPSTREAM: <carry>: Add Openshift's catalogd manifests
2025-02-14 03:35:16 openshift/operator-framework-operator-controller@274b815 Joe Lanford UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap
2025-02-14 03:35:18 openshift/operator-framework-operator-controller@0d3ea66 Todd Short UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments
2025-02-14 03:35:20 openshift/operator-framework-operator-controller@939bc73 Joe Lanford UPSTREAM: <carry>: fixup catalogd.Dockerfile paths
2025-02-14 03:35:22 openshift/operator-framework-operator-controller@24d8e73 Todd Short UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap
2025-02-14 03:35:24 openshift/operator-framework-operator-controller@3db665e Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:26 openshift/operator-framework-operator-controller@a264c15 Forrest Babcock UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations"
2025-02-14 03:35:28 openshift/operator-framework-operator-controller@789cbab Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:31 openshift/operator-framework-operator-controller@f337faa Todd Short UPSTREAM: <carry>: Remove vet from openshift verify
2025-02-14 03:35:34 openshift/operator-framework-operator-controller@3ea68d4 Todd Short UPSTREAM: <carry>: Skip another upstream test
2025-02-14 20:24:42 openshift/operator-framework-operator-controller@f1daf88 Camila Macedo UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests

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.

Copy link
Contributor

openshift-ci bot commented Feb 15, 2025

@openshift-bot: 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-02-14 19:43:51 operator-framework/operator-controller@7f00b13 Tayler Geiger Add documentation on setting up live debugging (#1653)
upstream commit list

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

Date Commit Author Message
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@4fdff7c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-02-14 03:34:52 openshift/operator-framework-operator-controller@1ebcce5 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2025-02-14 03:34:53 openshift/operator-framework-operator-controller@108c608 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-02-14 03:34:53 openshift/operator-framework-operator-controller@dd88323 Mikalai Radchuk UPSTREAM: <carry>: update owners
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@b36f4c5 Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@946989e Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2025-02-14 03:34:54 openshift/operator-framework-operator-controller@96d7acd 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-02-14 03:34:55 openshift/operator-framework-operator-controller@334003f Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2025-02-14 03:34:55 openshift/operator-framework-operator-controller@440edbc Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2025-02-14 03:34:56 openshift/operator-framework-operator-controller@59fe590 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-02-14 03:34:56 openshift/operator-framework-operator-controller@8cd51fe everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@09a4255 everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2025-02-14 03:34:57 openshift/operator-framework-operator-controller@8f41215 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2025-02-14 03:34:58 openshift/operator-framework-operator-controller@1600dfb 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-02-14 03:34:58 openshift/operator-framework-operator-controller@99eac20 Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2025-02-14 03:34:59 openshift/operator-framework-operator-controller@4e2c56b Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@5f004c3 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2025-02-14 03:35:00 openshift/operator-framework-operator-controller@4e8f40c dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2025-02-14 03:35:01 openshift/operator-framework-operator-controller@8878255 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2025-02-14 03:35:02 openshift/operator-framework-operator-controller@d1f25ec Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@c70140e Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller
2025-02-14 03:35:03 openshift/operator-framework-operator-controller@8077fba Todd Short UPSTREAM: <carry>: Add HowTo for origin tests
2025-02-14 03:35:04 openshift/operator-framework-operator-controller@50fc05a dtfranz UPSTREAM: <carry>: Add e2e registry Dockerfile
2025-02-14 03:35:05 openshift/operator-framework-operator-controller@52f3ddd everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@307829c Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2025-02-14 03:35:06 openshift/operator-framework-operator-controller@d7a6854 dtfranz UPSTREAM: <carry>: Enable downstream e2e
2025-02-14 03:35:07 openshift/operator-framework-operator-controller@09a39ce Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners
2025-02-14 03:35:08 openshift/operator-framework-operator-controller@5523ed7 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-02-14 03:35:09 openshift/operator-framework-operator-controller@c9cbfa6 Joe Lanford UPSTREAM: <carry>: generate and mount service-ca server cert
2025-02-14 03:35:09 openshift/operator-framework-operator-controller@dfcc001 Todd Short UPSTREAM: <carry>: Add support for proxy trustedCAs
2025-02-14 03:35:10 openshift/operator-framework-operator-controller@37d16e8 Todd Short UPSTREAM: <carry>: Fix error to build the image
2025-02-14 03:35:11 openshift/operator-framework-operator-controller@3087436 Camila Macedo UPSTREAM: <carry>: Fix make verify for mac os envs
2025-02-14 03:35:12 openshift/operator-framework-operator-controller@711fae2 Camila Macedo UPSTREAM: <carry>: Move operator-controller openshift files to its own dir
2025-02-14 03:35:13 openshift/operator-framework-operator-controller@6201f11 Camila Macedo UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19
2025-02-14 03:35:15 openshift/operator-framework-operator-controller@0bb4971 Camila Macedo UPSTREAM: <carry>: Add Openshift's catalogd manifests
2025-02-14 03:35:16 openshift/operator-framework-operator-controller@274b815 Joe Lanford UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap
2025-02-14 03:35:18 openshift/operator-framework-operator-controller@0d3ea66 Todd Short UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments
2025-02-14 03:35:20 openshift/operator-framework-operator-controller@939bc73 Joe Lanford UPSTREAM: <carry>: fixup catalogd.Dockerfile paths
2025-02-14 03:35:22 openshift/operator-framework-operator-controller@24d8e73 Todd Short UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap
2025-02-14 03:35:24 openshift/operator-framework-operator-controller@3db665e Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:26 openshift/operator-framework-operator-controller@a264c15 Forrest Babcock UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations"
2025-02-14 03:35:28 openshift/operator-framework-operator-controller@789cbab Joe Lanford UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations
2025-02-14 03:35:31 openshift/operator-framework-operator-controller@f337faa Todd Short UPSTREAM: <carry>: Remove vet from openshift verify
2025-02-14 03:35:34 openshift/operator-framework-operator-controller@3ea68d4 Todd Short UPSTREAM: <carry>: Skip another upstream test
2025-02-14 20:24:42 openshift/operator-framework-operator-controller@f1daf88 Camila Macedo UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests

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 Feb 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

1 similar comment
Copy link
Contributor

openshift-ci bot commented Feb 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

@tmshort
Copy link
Contributor

tmshort commented Feb 17, 2025

/retest

@camilamacedo86
Copy link
Contributor

/test okd-scos-e2e-aws-ovn

@tmshort
Copy link
Contributor

tmshort commented Feb 17, 2025

There's np need to retest okd-scos-e2e-aws-ovn since it's not required.

@tmshort
Copy link
Contributor

tmshort commented Feb 17, 2025

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 17, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 4138bad into openshift:main Feb 17, 2025
8 of 9 checks passed
@openshift-bot
Copy link
Author

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-catalogd
This PR has been included in build ose-olm-catalogd-container-v4.19.0-202502172038.p0.g4138bad.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Author

[ART PR BUILD NOTIFIER]

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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.