Skip to content

OCPBUGS-84520: remove openshift-catalogd exemption from terminationMessagePolicy monitor#31100

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
tmshort:fix-OCPBUGS-84520
May 1, 2026
Merged

OCPBUGS-84520: remove openshift-catalogd exemption from terminationMessagePolicy monitor#31100
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
tmshort:fix-OCPBUGS-84520

Conversation

@tmshort
Copy link
Copy Markdown
Contributor

@tmshort tmshort commented Apr 29, 2026

The catalogd deployment in openshift-catalogd now sets terminationMessagePolicy: FallbackToLogsOnError explicitly on its manager container in all active release branches (4.19+). The fix was confirmed in openshift/operator-framework-operator-controller across release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor test to enforce the policy again.

Fixes OCPBUGS-84520

Summary by CodeRabbit

  • Tests
    • Updated a cluster version operator monitor test to remove a prior exception for catalogd controller-manager pods, enabling stricter detection and reporting of terminationMessagePolicy failures for affected containers.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 29, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 29, 2026

@tmshort: This pull request references Jira Issue OCPBUGS-84520, which is invalid:

  • expected the bug to target the "5.0.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 catalogd deployment in openshift-catalogd now sets terminationMessagePolicy: FallbackToLogsOnError explicitly on its manager container in all active release branches (4.19+). The fix was confirmed in openshift/operator-framework-operator-controller across release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor test to enforce the policy again.

Fixes OCPBUGS-84520

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 29, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: dacabc8f-06ae-4f84-80f4-4f8365a20dfb

📥 Commits

Reviewing files that changed from the base of the PR and between dba4a56 and 4eac9eb.

📒 Files selected for processing (1)
  • pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go
💤 Files with no reviewable changes (1)
  • pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go

Walkthrough

A termination message policy monitor test removes an exception for openshift-catalogd's pods/catalogd-controller-manager from its grandfathered violations list, so matching containers will be evaluated against the policy rather than automatically exempted.

Changes

Cohort / File(s) Summary
Termination Message Policy Monitor
pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go
Removed three lines from the existingViolations grandfathering list, eliminating the exception for openshift-catalogd's pods/catalogd-controller-manager.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 11 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Test Structure And Quality ❓ Inconclusive The modified test file could not be accessed in the repository sandbox environment to perform detailed code quality review. Please provide access to the modified test file or verify it manually against Ginkgo quality standards for single responsibility, setup/cleanup, timeouts, and assertion messages.
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly and specifically references the main change: removing an exemption for openshift-catalogd from the terminationMessagePolicy monitor enforcement.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The modified file contains no Ginkgo test constructs with dynamic information. The 3-line removal only deletes exemption entries from an existingViolations list, not test names.
Microshift Test Compatibility ✅ Passed The PR modifies an existing monitor test by removing an exemption entry, not adding new Ginkgo e2e tests that the check evaluates.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This pull request does not add any new Ginkgo e2e tests. The modified file is a monitor test utility that performs compliance checking on pod containers, not a test suite.
Topology-Aware Scheduling Compatibility ✅ Passed This change removes an entry from a test file's existing violations list and does not modify any scheduling constraints, affinity rules, or topology-aware configurations.
Ote Binary Stdout Contract ✅ Passed The modified file contains no process-level stdout writes. All string formatting uses fmt.Sprintf for internal use, and data returns through JUnit structures with no calls to fmt.Print*, klog, or os.Stdout.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies a monitor test framework component by removing an exemption from a grandfathering list. It does not add any new Ginkgo e2e tests, which is required for the IPv6/disconnected network compatibility check to apply.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Review rate limit: 8/10 reviews remaining, refill in 7 minutes and 42 seconds.

Comment @coderabbitai help to get the list of available commands and usage tips.

@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 Apr 29, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-84520, 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 (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

The catalogd deployment in openshift-catalogd now sets terminationMessagePolicy: FallbackToLogsOnError explicitly on its manager container in all active release branches (4.19+). The fix was confirmed in openshift/operator-framework-operator-controller across release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor test to enforce the policy again.

Fixes OCPBUGS-84520

Summary by CodeRabbit

  • Tests
  • Updated the cluster version operator monitor test to remove a known violation allowance, enabling stricter enforcement of termination message policies for pod containers.

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.

…y monitor

The catalogd deployment in openshift-catalogd now sets
terminationMessagePolicy: FallbackToLogsOnError explicitly on its
manager container in all active release branches (4.19+). The fix was
confirmed in openshift/operator-framework-operator-controller across
release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor
test to enforce the policy again.

Fixes OCPBUGS-84520

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Todd Short <todd.short@me.com>
@tmshort tmshort force-pushed the fix-OCPBUGS-84520 branch from dba4a56 to 4eac9eb Compare April 29, 2026 20:28
@openshift-ci openshift-ci Bot requested review from deads2k and sjenning April 29, 2026 20:28
@openshift-ci-robot
Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-84520, which is valid.

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

In response to this:

The catalogd deployment in openshift-catalogd now sets terminationMessagePolicy: FallbackToLogsOnError explicitly on its manager container in all active release branches (4.19+). The fix was confirmed in openshift/operator-framework-operator-controller across release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor test to enforce the policy again.

Fixes OCPBUGS-84520

Summary by CodeRabbit

  • Tests
  • Updated a cluster version operator monitor test to remove a prior exception for catalogd controller-manager pods, enabling stricter detection and reporting of terminationMessagePolicy failures for affected containers.

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-merge-bot openshift-merge-bot Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Apr 29, 2026
@joelanford
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented Apr 30, 2026

/retest

@tmshort
Copy link
Copy Markdown
Contributor Author

tmshort commented Apr 30, 2026

/assign smg247

@smg247
Copy link
Copy Markdown
Member

smg247 commented Apr 30, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coderabbitai[bot], joelanford, smg247, tmshort

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2026
@oceanc80
Copy link
Copy Markdown
Contributor

oceanc80 commented May 1, 2026

Verified that [sig-arch] all containers in ns/openshift-catalogd must have terminationMessagePolicy=FallbackToLogsOnError is running and passing again.

/verified by @oceanc80

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

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

Details

In response to this:

Verified that [sig-arch] all containers in ns/openshift-catalogd must have terminationMessagePolicy=FallbackToLogsOnError is running and passing again.

/verified by @oceanc80

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 May 1, 2026

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

@openshift-merge-bot openshift-merge-bot Bot merged commit 67584cb into openshift:main May 1, 2026
21 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@tmshort: Jira Issue Verification Checks: Jira Issue OCPBUGS-84520
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-84520 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

The catalogd deployment in openshift-catalogd now sets terminationMessagePolicy: FallbackToLogsOnError explicitly on its manager container in all active release branches (4.19+). The fix was confirmed in openshift/operator-framework-operator-controller across release-4.19 through main.

Remove the exemption that was added by TRT-2084 to allow the monitor test to enforce the policy again.

Fixes OCPBUGS-84520

Summary by CodeRabbit

  • Tests
  • Updated a cluster version operator monitor test to remove a prior exception for catalogd controller-manager pods, enabling stricter detection and reporting of terminationMessagePolicy failures for affected containers.

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 tmshort deleted the fix-OCPBUGS-84520 branch May 1, 2026 13:13
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in release 5.0.0-0.nightly-2026-05-01-200018

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants