OTA-2110: remove cluster_id from LLM-bound readiness payload

[jrangelramos]

Summary

• Remove cluster_id (spec.clusterID) from the readiness JSON sent to the LLM in agentic runs
• The cluster UUID adds no analytical value for upgrade risk assessment but creates an unnecessary correlation surface at the LLM provider
• The identifier remains available in CR metadata for audit purposes

References

• Fixes: https://redhat.atlassian.net/browse/OTA-2110
• Source: Security Architecture Review (SAR) — Agentic Updates OLS 2.0

Test plan

• go test ./pkg/readiness/ passes

🤖 Generated with Claude Code

Summary by CodeRabbit

• Bug Fixes
  • Readiness results no longer include the internal cluster identifier.
  • Cluster readiness information continues to report the release channel correctly.

[openshift-merge-bot]

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: LGTM mode

[openshift-ci-robot]

@jrangelramos: This pull request references OTA-2110 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 weakness to target the "5.1.0" version, but no target version was set.

Details

In response to this:

Summary

• Remove cluster_id (spec.clusterID) from the readiness JSON sent to the LLM in agentic runs
• The cluster UUID adds no analytical value for upgrade risk assessment but creates an unnecessary correlation surface at the LLM provider
• The identifier remains available in CR metadata for audit purposes

References

• Fixes: https://redhat.atlassian.net/browse/OTA-2110
• Source: Security Architecture Review (SAR) — Agentic Updates OLS 2.0

Test plan

• Unit tests updated to assert cluster_id is absent from readiness payload
• go test ./pkg/readiness/ passes

🤖 Generated with Claude Code

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]

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: Pro Plus

Run ID: e6da3b7d-925c-4c4d-9388-f39c10c02b8c

📥 Commits

Reviewing files that changed from the base of the PR and between 208b01a and 5621995.

📒 Files selected for processing (2)

• pkg/readiness/checks_test.go
• pkg/readiness/cluster_conditions.go

💤 Files with no reviewable changes (1)

• pkg/readiness/cluster_conditions.go

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.

---

Walkthrough

The readiness result no longer includes cluster_id. The test now verifies that the field is absent while channel remains populated.

Changes

Readiness payload

Layer / File(s)	Summary
Update readiness payload and test pkg/readiness/cluster_conditions.go, pkg/readiness/checks_test.go	The readiness result omits cluster_id. The test verifies that omission and retains the channel assertion.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 56219

This localized change removes an unnecessary cluster identifier from the readiness payload while retaining it in resource metadata for audit purposes; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 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.
Stable And Deterministic Test Names	✅ Passed	The PR changes only assertions and payload fields; TestClusterConditionsCheck remains a static Go test name, and no Ginkgo title is added or changed.
Test Structure And Quality	✅ Passed	The changed test uses Go testing, not Ginkgo; it adds a specific diagnostic assertion, uses a fake client, and introduces no cluster waits or resource lifecycle.
Microshift Test Compatibility	✅ Passed	The diff changes a standard Go TestClusterConditionsCheck and ClusterConditionsCheck; it adds no Ginkgo e2e test or new MicroShift-incompatible test usage.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The diff changes only readiness production code and an existing standard Go testing unit test; it adds no Ginkgo e2e test or multi-node/HA assumption.
Topology-Aware Scheduling Compatibility	✅ Passed	The diff only removes cluster_id from readiness output and updates its unit test; it adds no manifests, controllers, replicas, affinity, selectors, tolerations, or topology constraints.
Ote Binary Stdout Contract	✅ Passed	The diff only removes cluster_id from readiness data and updates its test; changed files contain no main/init/TestMain/suite setup or stdout writes.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The patch changes a standard Go unit test and readiness map logic; it adds no Ginkgo e2e test, IPv4 assumption, or external connectivity requirement.
No-Weak-Crypto	✅ Passed	The PR only removes cluster_id from readiness output and updates its test; the changed files introduce no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret comparisons.
Container-Privileges	✅ Passed	The PR changes only readiness Go files and adds no privilege settings; existing privileged/hostNetwork manifest entries are identical to the parent revision.
No-Sensitive-Data-In-Logs	✅ Passed	The diff removes cluster_id from readiness data and adds no logging. Existing readiness logs contain only versions and marshal errors, not passwords, tokens, PII, hostnames, or customer data.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and concisely describes the main change: removing cluster_id from the LLM-bound readiness payload.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

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

[ankitathomas]

/lgtm

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-agnostic-operator
/test e2e-agnostic-ovn
/test e2e-agnostic-ovn-techpreview-serial-1of3
/test e2e-agnostic-ovn-techpreview-serial-2of3
/test e2e-agnostic-ovn-techpreview-serial-3of3
/test e2e-agnostic-ovn-upgrade-into-change
/test e2e-agnostic-ovn-upgrade-out-of-change
/test e2e-aws-ovn-techpreview
/test e2e-hypershift
/test e2e-hypershift-conformance

[jhadvig]

/lgtm

[openshift-ci]

@jrangelramos: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-hypershift-conformance	d0e3219	link	true	/test e2e-hypershift-conformance
ci/prow/e2e-aws-ovn-techpreview	d0e3219	link	true	/test e2e-aws-ovn-techpreview
ci/prow/e2e-agnostic-ovn-techpreview-serial-1of3	d0e3219	link	true	/test e2e-agnostic-ovn-techpreview-serial-1of3
ci/prow/e2e-agnostic-ovn	d0e3219	link	true	/test e2e-agnostic-ovn
ci/prow/e2e-hypershift	d0e3219	link	true	/test e2e-hypershift

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.

[wking]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, jhadvig, jrangelramos, wking

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 [wking]

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

[jrangelramos]

/verified by @jrangelramos

Before

$ oc get agenticrun ota-5-0-0-ec-5-to-5-0-1 -o yaml | grep cluster_id | jq '.checks["cluster_conditions"].cluster_id'
"f4866a85-4db2-4774-a60a-88e4045ccc6e"

After

$ oc get agenticrun ota-5-0-0-ec-5-to-5-0-1 -o yaml | grep cluster_id | wc -c                                        
0

[openshift-ci-robot]

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

Details

In response to this:

/verified by @jrangelramos

Before

$ oc get agenticrun ota-5-0-0-ec-5-to-5-0-1 -o yaml | grep cluster_id | jq '.checks["cluster_conditions"].cluster_id'
"f4866a85-4db2-4774-a60a-88e4045ccc6e"

After

$ oc get agenticrun ota-5-0-0-ec-5-to-5-0-1 -o yaml | grep cluster_id | wc -c                                        
0

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.

[wking]

e2e-agnostic-ovn:

: [Jira:"Cluster Version Operator"] cluster-version-operator readiness checks should report cluster conditions matching ClusterVersion status expand_less	1s
{  fail [github.com/openshift/cluster-version-operator/test/cvo/readiness.go:227]: cluster ID should match ClusterVersion spec
Expected
    <nil>: nil
to equal
    <string>: 9b552191-222f-4b1a-bcbf-6b14d81a8265}

which points out that you'll also want to remove this:

$ git grep -B1 'cluster ID should match' origin/pr/1451
origin/pr/1451:test/cvo/readiness.go-           o.Expect(result.Data["cluster_id"]).To(o.Equal(string(cv.Spec.ClusterID)),
origin/pr/1451:test/cvo/readiness.go:                   "cluster ID should match ClusterVersion spec")

/hold