Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #184

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

Conversation

openshift-bot
Copy link

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

Date Commit Author Message
2024-10-31 20:36:28 operator-framework/operator-controller@cd0b096 dependabot[bot] 🌱 Bump github.com/fsnotify/fsnotify from 1.7.0 to 1.8.0 (#1420)
upstream commit list

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

Date Commit Author Message
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@8121071 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@0bb02ac Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@beff1cd 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
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@5866f85 Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@aec1f5f Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@11e2959 Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@31e1422 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
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@d8ab54c Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@16f42c0 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@e84ab14 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
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@7739500 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@0cb3d5f everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@98327e2 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@3ce40ee 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
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@928d96b Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@afa7114 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@bf3f0d6 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@23bd577 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-10-30 14:04:16 openshift/operator-framework-operator-controller@44f9dab Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2024-10-30 14:04:17 openshift/operator-framework-operator-controller@5da993a Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-10-30 20:53:11 openshift/operator-framework-operator-controller@7f55e90 Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller

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 28 commits October 31, 2024 20:35
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.42 to 9.5.43.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.42...9.5.43)

---
updated-dependencies:
- dependency-name: mkdocs-material
  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 [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/fsnotify/fsnotify/releases)
- [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md)
- [Commits](fsnotify/fsnotify@v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/fsnotify/fsnotify
  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>
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>
Signed-off-by: dtfranz <dfranz@redhat.com>
… cluster-olm-operator

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Pass global-pull-secret to the manager container.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
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 <todd.short@me.com>
@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 labels Nov 1, 2024
@openshift-bot openshift-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 1, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 1, 2024
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2024
@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
2024-10-31 20:36:28 operator-framework/operator-controller@cd0b096 dependabot[bot] 🌱 Bump github.com/fsnotify/fsnotify from 1.7.0 to 1.8.0 (#1420)
upstream commit list

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

Date Commit Author Message
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@8121071 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@0bb02ac Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@beff1cd 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
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@5866f85 Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@aec1f5f Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@11e2959 Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@31e1422 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
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@d8ab54c Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@16f42c0 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@e84ab14 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
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@7739500 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@0cb3d5f everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@98327e2 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@3ce40ee 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
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@928d96b Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@afa7114 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@bf3f0d6 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@23bd577 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-10-30 14:04:16 openshift/operator-framework-operator-controller@44f9dab Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2024-10-30 14:04:17 openshift/operator-framework-operator-controller@5da993a Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-10-30 20:53:11 openshift/operator-framework-operator-controller@7f55e90 Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller

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 Nov 1, 2024

@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
2024-10-31 20:36:28 operator-framework/operator-controller@cd0b096 dependabot[bot] 🌱 Bump github.com/fsnotify/fsnotify from 1.7.0 to 1.8.0 (#1420)
upstream commit list

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

Date Commit Author Message
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@8121071 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-10-30 14:04:08 openshift/operator-framework-operator-controller@0bb02ac Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@beff1cd 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
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@5866f85 Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-10-30 14:04:09 openshift/operator-framework-operator-controller@aec1f5f Brett Tofel UPSTREAM: <carry>: Add pointer to tooling README
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@11e2959 Mikalai Radchuk UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
2024-10-30 14:04:10 openshift/operator-framework-operator-controller@31e1422 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
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@d8ab54c Mikalai Radchuk UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@16f42c0 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-10-30 14:04:11 openshift/operator-framework-operator-controller@e84ab14 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
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@7739500 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-10-30 14:04:12 openshift/operator-framework-operator-controller@0cb3d5f everettraven UPSTREAM: <carry>: add openshift kustomize overlay
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@98327e2 Todd Short UPSTREAM: <carry>: Add tmshort to approvers
2024-10-30 14:04:13 openshift/operator-framework-operator-controller@3ce40ee 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
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@928d96b Todd Short UPSTREAM: <carry>: Properly copy and call kustomize
2024-10-30 14:04:14 openshift/operator-framework-operator-controller@afa7114 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@bf3f0d6 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-10-30 14:04:15 openshift/operator-framework-operator-controller@23bd577 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-10-30 14:04:16 openshift/operator-framework-operator-controller@44f9dab Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
2024-10-30 14:04:17 openshift/operator-framework-operator-controller@5da993a Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-10-30 20:53:11 openshift/operator-framework-operator-controller@7f55e90 Todd Short UPSTREAM: <carry>: Update openshift CAs to operator-controller

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 Nov 1, 2024

[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 Nov 1, 2024

[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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD a908b2c and 2 for PR HEAD f5b7b79 in total

Copy link
Contributor

openshift-ci bot commented Nov 1, 2024

@openshift-bot: 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 d40b900 into openshift:main Nov 1, 2024
7 checks passed
@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.18.0-202411010737.p0.gd40b900.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
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.

9 participants