CNF-16772, CNF-16780, CNF-19588, CNF-25274: Sync from upstream (08-Jul-2026)

[jzding]

Upstream PRs included

• #267 chore(deps): bump golang.org/x/net from 0.49.0 to 0.55.0
• #266 CNF-25274: Add minKubeVersion to CSV for OCP 5.0 certification (CNF-25274)
• #263 CNF-16772: Add CI tests for GM metric cleanup on PtpConfig deletion (CNF-16772,OCPBUGS-7808,OCPBUGS-7811)
• #251 PTP CI: verify PTP processes restart and socket cleanup after termination (CNF-16780,OCPBUGS-8112)
• #171 CNF-19588: CI test for clockClass recovery after cloud-event-proxy crash (CNF-19588)

Summary by CodeRabbit

• New Features

  • Added support for a minimum Kubernetes version requirement in the operator metadata.
  • Improved event handling to better validate current state after disruptions and support multiple initial event topics.
  • Added readiness checks for consumer workloads before event validation begins.

• Bug Fixes

  • Strengthened conformance coverage for restarts, proxy recovery, and config deletion/reapply scenarios.
  • Improved restart-state tracking to better detect issues during process recovery.

• Chores

  • Updated metadata timestamps and refreshed dependency versions.

[openshift-ci-robot]

@jzding: This pull request references CNF-16772 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-16780 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-19588 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-25274 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-7808, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.13.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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.

This pull request references Jira Issue OCPBUGS-7811, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.13.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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.

This pull request references Jira Issue OCPBUGS-8112, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.14.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done-Errata) instead

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:

Upstream PRs included

• #267 chore(deps): bump golang.org/x/net from 0.49.0 to 0.55.0
• #266 CNF-25274: Add minKubeVersion to CSV for OCP 5.0 certification (CNF-25274)
• #263 CNF-16772: Add CI tests for GM metric cleanup on PtpConfig deletion (CNF-16772,OCPBUGS-7808,OCPBUGS-7811)
• #251 PTP CI: verify PTP processes restart and socket cleanup after termination (CNF-16780,OCPBUGS-8112)
• #171 CNF-19588: CI test for clockClass recovery after cloud-event-proxy crash (CNF-19588)

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]

@jzding: This pull request references CNF-16772 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-16780 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-19588 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-25274 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-7808, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.13.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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.

This pull request references Jira Issue OCPBUGS-7811, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.13.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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.

This pull request references Jira Issue OCPBUGS-8112, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.14.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done-Errata) instead

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.

Details

In response to this:

Upstream PRs included

• #267 chore(deps): bump golang.org/x/net from 0.49.0 to 0.55.0
• #266 CNF-25274: Add minKubeVersion to CSV for OCP 5.0 certification (CNF-25274)
• #263 CNF-16772: Add CI tests for GM metric cleanup on PtpConfig deletion (CNF-16772,OCPBUGS-7808,OCPBUGS-7811)
• #251 PTP CI: verify PTP processes restart and socket cleanup after termination (CNF-16780,OCPBUGS-8112)
• #171 CNF-19588: CI test for clockClass recovery after cloud-event-proxy crash (CNF-19588)

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]

Walkthrough

This PR adds minKubeVersion: 1.35.0 to ClusterServiceVersion manifests and refreshes CSV timestamps, bumps several golang.org/x/* dependencies, and expands PTP conformance tests with new event-readiness helpers, health-check verification, restart/socket-error checks, and GM PtpConfig deletion behavior tests, plus a metrics constant and a log message tweak.

Changes

CSV Manifest and Dependency Updates

Layer / File(s)	Summary
Add minKubeVersion and refresh CSV timestamps bundle/manifests/ptp-operator.clusterserviceversion.yaml, config/manifests/bases/ptp-operator.clusterserviceversion.yaml, manifests/stable/ptp-operator.clusterserviceversion.yaml	Adds spec.minKubeVersion: 1.35.0 across CSV manifests and updates createdAt timestamps in bundle and stable manifests.
Bump golang.org/x/ dependency versions* go.mod	Updates versions for x/crypto, x/mod, x/net, x/sync, x/sys, x/term, x/text, and x/tools; x/oauth2 and x/time unchanged.

PTP Conformance Test Enhancements

Layer / File(s)	Summary
Consumer readiness and initial event publishing helpers test/pkg/event/event.go	Adds WaitForConsumerReady, WaitForCloudEventProxyReady, refactors PushInitialEvent into multi-topic PushInitialEvents, changes createStoredEvent keying to prefer Resource over DataType, and updates SubscribeToGMChangeEvents to call PushInitialEvents once.
Add process restart count metric constant test/pkg/metrics/metrics.go	Adds exported OpenshiftPtpProcessRestartCount constant.
ClockClass recovery test after cloud-event-proxy crash test/conformance/serial/ptp.go	Adds a test validating clockClass before/after killing the cloud-event-proxy sidecar, adds verifyClockClassCurrentState, and wires consumer readiness via WaitForConsumerReady.
Event API v2 health endpoint verification test/conformance/serial/ptp.go	Changes default and explicit apiVersion=2.0 tests to curl /health on all pods and assert "OK" instead of log matching.
SIGTERM restart and GM PtpConfig deletion tests test/conformance/serial/ptp.go	Adds SIGTERM restart tests for ptp4l, phc2sys, ts2phc; adds ts2phc metric cleanup/re-apply tests on GM PtpConfig deletion; introduces ensureGMPtpConfigRestored, getProcessConfigAndRestartCount, and verifyProcessRestartNoSocketErrors helpers.
Adjust version comparison log message test/pkg/ptphelper/ptphelper.go	Updates logged comparison operator from <= to < in IsPTPOperatorVersionAtLeast.

Estimated code review effort: 4 (Complex) | ~60 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Test as Conformance Test
  participant Sidecar as cloud-event-proxy
  participant Consumer as Consumer App
  participant EventAPI as Event API v2

  Test->>Consumer: deploy and WaitForConsumerReady()
  Consumer->>Sidecar: curl /health
  Sidecar-->>Consumer: OK
  Test->>EventAPI: verify initial clockClass
  Test->>Sidecar: kill cloud-event-proxy process
  Test->>Sidecar: WaitForCloudEventProxyReady()
  Sidecar-->>Test: /health OK after restart
  Test->>EventAPI: verifyClockClassCurrentState() via fresh subscription
  EventAPI-->>Test: PushInitialEvent + observed clockClass

Loading

🚥 Pre-merge checks | ✅ 5 | ❌ 10

❌ Failed checks (10 inconclusive)

Check name	Status	Explanation	Resolution
Stable And Deterministic Test Names	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Test Structure And Quality	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Microshift Test Compatibility	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Single Node Openshift (Sno) Test Compatibility	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Topology-Aware Scheduling Compatibility	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ote Binary Stdout Contract	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ipv6 And Disconnected Network Test Compatibility	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Weak-Crypto	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Container-Privileges	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
No-Sensitive-Data-In-Logs	❓ Inconclusive	Repository clone failed, so this custom check could not run with code access.	Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.

✅ Passed checks (5 passed)

Check name	Status	Explanation
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.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately reflects that this is an upstream sync, though it is broad and does not describe the specific changes.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Warning

Review ran into problems

🔥 Problems

Git: Failed to clone repository. Please run the @coderabbitai full review command to re-trigger a full review. If the issue persists, set path_filters to include or exclude specific files.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci-robot]

@jzding: This pull request references CNF-16772 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-16780 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-19588 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-25274 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-7808, which is invalid:

• expected the bug to be open, but it isn't
• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.13.0" instead
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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:

Upstream PRs included

• #267 chore(deps): bump golang.org/x/net from 0.49.0 to 0.55.0
• #266 CNF-25274: Add minKubeVersion to CSV for OCP 5.0 certification (CNF-25274)
• #263 CNF-16772: Add CI tests for GM metric cleanup on PtpConfig deletion (CNF-16772,OCPBUGS-7808,OCPBUGS-7811)
• #251 PTP CI: verify PTP processes restart and socket cleanup after termination (CNF-16780,OCPBUGS-8112)
• #171 CNF-19588: CI test for clockClass recovery after cloud-event-proxy crash (CNF-19588)

Summary by CodeRabbit

• New Features

• Added support for a minimum Kubernetes version requirement in the operator metadata.

• Improved event handling to better validate current state after disruptions and support multiple initial event topics.

• Added readiness checks for consumer workloads before event validation begins.

• Bug Fixes

• Strengthened conformance coverage for restarts, proxy recovery, and config deletion/reapply scenarios.

• Improved restart-state tracking to better detect issues during process recovery.

• Chores

• Updated metadata timestamps and refreshed dependency versions.

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]

@jzding: This pull request references CNF-16772 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-16780 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-19588 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

This pull request references CNF-25274 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Upstream PRs included

• #267 chore(deps): bump golang.org/x/net from 0.49.0 to 0.55.0
• #266 CNF-25274: Add minKubeVersion to CSV for OCP 5.0 certification (CNF-25274)
• #263 CNF-16772: Add CI tests for GM metric cleanup on PtpConfig deletion (CNF-16772,OCPBUGS-7808,OCPBUGS-7811)
• #251 PTP CI: verify PTP processes restart and socket cleanup after termination (CNF-16780,OCPBUGS-8112)
• #171 CNF-19588: CI test for clockClass recovery after cloud-event-proxy crash (CNF-19588)

Summary by CodeRabbit

• New Features

• Added support for a minimum Kubernetes version requirement in the operator metadata.

• Improved event handling to better validate current state after disruptions and support multiple initial event topics.

• Added readiness checks for consumer workloads before event validation begins.

• Bug Fixes

• Strengthened conformance coverage for restarts, proxy recovery, and config deletion/reapply scenarios.

• Improved restart-state tracking to better detect issues during process recovery.

• Chores

• Updated metadata timestamps and refreshed dependency versions.

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.

[jzding]

/test e2e-aws-ovn

[jzding]

/test e2e-aws-ovn

[nocturnalastro]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jzding, nocturnalastro

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:

• OWNERS [jzding,nocturnalastro]

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

[jzding]

/verified later @dpopsuev

[openshift-ci-robot]

@jzding: This PR has been marked to be verified later by @dpopsuev.

Details

In response to this:

/verified later @dpopsuev

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]

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