Skip to content

NO-ISSUE: Synchronize From Upstream Repositories#1201

Merged
openshift-merge-bot[bot] merged 6 commits intoopenshift:mainfrom
openshift-bot:synchronize-upstream
Jan 23, 2026
Merged

NO-ISSUE: Synchronize From Upstream Repositories#1201
openshift-merge-bot[bot] merged 6 commits intoopenshift:mainfrom
openshift-bot:synchronize-upstream

Conversation

@openshift-bot
Copy link
Copy Markdown
Contributor

@openshift-bot openshift-bot commented Jan 21, 2026

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2026-01-20 15:06:35 operator-framework/operator-lifecycle-manager@74911fc dependabot[bot] 🌱 Bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4 (#3740)
2026-01-20 16:08:14 operator-framework/operator-lifecycle-manager@34ea6ce Jian Zhang Fix nil pointer dereference panic in event recorder (#3727)
2026-01-20 20:00:49 operator-framework/operator-lifecycle-manager@afb9e80 Camila Macedo Add e2e test for operator workload persistence after catalog deletion (#3737)
2026-01-21 15:34:42 operator-framework/operator-lifecycle-manager@01449fd Jian Zhang Fix server startup failure when client-ca is empty or not provided (#3742)
2026-01-22 15:25:12 operator-framework/operator-lifecycle-manager@6fc19e0 Todd Short Add APIServer TLS controller for OpenShift cluster-wide TLS configuration (#3739)
2026-01-22 19:43:13 operator-framework/operator-lifecycle-manager@d30e23d Camila Macedo (e2e): Enhance e2e test to check workload resilience when catalogs goes away (#3747)

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

@openshift-bot openshift-bot added 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 Jan 21, 2026
@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 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2026-01-20 15:06:35 operator-framework/operator-lifecycle-manager@74911fc dependabot[bot] 🌱 Bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4 (#3740)
2026-01-20 16:08:14 operator-framework/operator-lifecycle-manager@34ea6ce Jian Zhang Fix nil pointer dereference panic in event recorder (#3727)
2026-01-20 20:00:49 operator-framework/operator-lifecycle-manager@afb9e80 Camila Macedo Add e2e test for operator workload persistence after catalog deletion (#3737)

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

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

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2026

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

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2026-01-20 15:06:35 operator-framework/operator-lifecycle-manager@74911fc dependabot[bot] 🌱 Bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4 (#3740)
2026-01-20 16:08:14 operator-framework/operator-lifecycle-manager@34ea6ce Jian Zhang Fix nil pointer dereference panic in event recorder (#3727)
2026-01-20 20:00:49 operator-framework/operator-lifecycle-manager@afb9e80 Camila Macedo Add e2e test for operator workload persistence after catalog deletion (#3737)

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2026

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

1 similar comment
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2026

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jianzhangbjz
Copy link
Copy Markdown
Contributor

/retitle OCPBUGS-69688: Synchronize From Upstream Repositories

@openshift-ci openshift-ci Bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-69688: Synchronize From Upstream Repositories Jan 21, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-bot: This pull request references Jira Issue OCPBUGS-69688, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2026-01-20 15:06:35 operator-framework/operator-lifecycle-manager@74911fc dependabot[bot] 🌱 Bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4 (#3740)
2026-01-20 16:08:14 operator-framework/operator-lifecycle-manager@34ea6ce Jian Zhang Fix nil pointer dereference panic in event recorder (#3727)
2026-01-20 20:00:49 operator-framework/operator-lifecycle-manager@afb9e80 Camila Macedo Add e2e test for operator workload persistence after catalog deletion (#3737)

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.

@jianzhangbjz
Copy link
Copy Markdown
Contributor

/payload-job periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2026

@jianzhangbjz: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.22-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d897af20-f663-11f0-93b9-7e6a1414279a-0

@jianzhangbjz
Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jianzhangbjz: This pull request references Jira Issue OCPBUGS-69688, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

Details

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.

@jianzhangbjz
Copy link
Copy Markdown
Contributor

/test e2e-gcp-olm

@jianzhangbjz
Copy link
Copy Markdown
Contributor

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jianzhangbjz: This PR has been marked as verified by @jianzhangbjz.

Details

In response to this:

Test passed. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-operator-framework-olm-1201-ci-4.22-e2e-azure-ovn-upgrade/2013777387895918592
/verified by @jianzhangbjz

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 8cfcfeb and 2 for PR HEAD fa8fb0a in total

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Jan 21, 2026

/retest

@openshift-bot openshift-bot changed the title OCPBUGS-69688: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Jan 22, 2026
@openshift-ci-robot openshift-ci-robot removed verified Signifies that the PR passed pre-merge verification criteria jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. labels Jan 22, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2026
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 22, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-bot: This pull request explicitly references no jira issue.

Details

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2026-01-20 15:06:35 operator-framework/operator-lifecycle-manager@74911fc dependabot[bot] 🌱 Bump github.com/sirupsen/logrus from 1.9.3 to 1.9.4 (#3740)
2026-01-20 16:08:14 operator-framework/operator-lifecycle-manager@34ea6ce Jian Zhang Fix nil pointer dereference panic in event recorder (#3727)
2026-01-20 20:00:49 operator-framework/operator-lifecycle-manager@afb9e80 Camila Macedo Add e2e test for operator workload persistence after catalog deletion (#3737)
2026-01-21 15:34:42 operator-framework/operator-lifecycle-manager@01449fd Jian Zhang Fix server startup failure when client-ca is empty or not provided (#3742)

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.

dependabot Bot and others added 6 commits January 23, 2026 00:03
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.9.3 to 1.9.4.
- [Release notes](https://github.com/sirupsen/logrus/releases)
- [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md)
- [Commits](sirupsen/logrus@v1.9.3...v1.9.4)

---
updated-dependencies:
- dependency-name: github.com/sirupsen/logrus
  dependency-version: 1.9.4
  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>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 74911fcd295a91d9a3f407a8340ece0d12ecdac3
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 34ea6ce507501c025f7cfe42f628b131238b4b09
… (#3737)

Assisted-by: Cursor/CLAUDE
Upstream-repository: operator-lifecycle-manager
Upstream-commit: afb9e80a6649342469da7fd1acb1e37291ef68e9
…3742)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 01449fd033f5e4597c971d2ef14832c109d878d9
…tion (#3739)

Implements a controller that watches the OpenShift APIServer resource and
provides thread-safe access to TLS configuration for HTTPS servers/clients.

The controller is modeled after the existing proxy controller.

This is intended to be used by the OLM operator, Catalog operator and
marketplace operator (but it will need to be copied). It will also be
used by the downstream PSM component.

Assisted-By: Claude

Signed-off-by: Todd Short <todd.short@me.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6fc19e0f6397a572e6bd4e9984aa213960553691
…es away (#3747)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: d30e23ddb3b5e1ded058b62284d46c21c86d2966
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2026
@jianzhangbjz
Copy link
Copy Markdown
Contributor

/retest-required

@jianzhangbjz
Copy link
Copy Markdown
Contributor

@jianzhangbjz
Copy link
Copy Markdown
Contributor

/retest-required
/verified by @jianzhangbjz

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 23, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jianzhangbjz: This PR has been marked as verified by @jianzhangbjz.

Details

In response to this:

/retest-required
/verified by @jianzhangbjz

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 23, 2026

@openshift-bot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Jan 23, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 1222e2d into openshift:main Jan 23, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants