netobserv: few env renamed; bundle now uses downstream config already by jotak · Pull Request #81071 · openshift/release

jotak · 2026-06-25T12:11:56Z

Needs: netobserv/netobserv-operator#2822

Summary by CodeRabbit

This update adjusts NetObserv’s OpenShift CI setup so the operator tests rely on the downstream configuration that is already present, instead of patching the CSV during test execution to force downstream metrics scraping.

Practically, this affects the NetObserv operator CI jobs and install step used by OpenShift’s release/release-associated infrastructure:

the e2e-operator and e2etests workflows stop applying the CSV env var patch for downstream deployment behavior
the operator install script no longer injects DOWNSTREAM_DEPLOYMENT=true into the CSV
console plugin image selection is aligned with the newer web console image env vars for OCP version-specific overrides

jotak · 2026-06-25T12:12:13Z

/cc @memodi

coderabbitai · 2026-06-25T12:12:22Z

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: 1c1c12db-3308-4c78-b676-0b8a6dca50b9

📥 Commits

Reviewing files that changed from the base of the PR and between 7a80eb5 and 772bc4e.

📒 Files selected for processing (2)

ci-operator/config/netobserv/netobserv-operator/netobserv-netobserv-operator-main.yaml
ci-operator/step-registry/netobserv/install-operator/netobserv-install-operator-commands.sh

💤 Files with no reviewable changes (1)

ci-operator/config/netobserv/netobserv-operator/netobserv-netobserv-operator-main.yaml

Walkthrough

The PR removes the downstream CSV patching step from two netobserv CI workflows and from the install-operator helper script. It also updates the console plugin image lookup keys used by the install script for different OCP version ranges.

Changes

Netobserv operator install flow updates

Layer / File(s)	Summary
Remove downstream CSV patching `ci-operator/step-registry/netobserv/install-operator/netobserv-install-operator-commands.sh`, `ci-operator/config/netobserv/netobserv-operator/netobserv-netobserv-operator-main.yaml`	`patch_csv_images()` drops the `DOWNSTREAM_DEPLOYMENT` JSON patch, and the `e2e-operator` and `e2etests` workflows remove the matching CSV patch step.
Use web-console image keys `ci-operator/step-registry/netobserv/install-operator/netobserv-install-operator-commands.sh`	The console plugin image branch switches its OCP-version-based lookup from `RELATED_IMAGE_CONSOLE_PLUGIN_` to `RELATED_IMAGE_WEB_CONSOLE_` variables.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (14 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title matches the main changes: env key renames and removal of the downstream CSV patch because the bundle already uses downstream config.
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	PASS: The diff only touches CI config and an install script; no Ginkgo test titles (It/Describe/Context/When) were added or modified.
Test Structure And Quality	✅ Passed	PASS: PR only changes CI config and a shell installer script; no Ginkgo test blocks or cluster-test structure to review.
Microshift Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the PR only changes CI config and install script logic, so MicroShift test compatibility is not implicated.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	No new Ginkgo tests were added; the diff only changes CI config and an install script, with no multi-node/SNO assumptions.
Topology-Aware Scheduling Compatibility	✅ Passed	PASS: The PR only changes CI test/config and CSV image env handling; no deployment manifests, replicas, affinity, nodeSelectors, or topology spread constraints were added.
Ote Binary Stdout Contract	✅ Passed	PR only touches ci-operator YAML and a shell install helper; no OTE binary main/suite code or stdout contract changes were introduced.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PASS: PR only changes ci config and an install script; no Ginkgo test files or new IPv4/public-internet assumptions were added.
No-Weak-Crypto	✅ Passed	Touched YAML and shell changes contain no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or token comparisons.
Container-Privileges	✅ Passed	No privileged flags, host networking, or root escalation were added; the PR only removes CSV patching and renames env vars.
No-Sensitive-Data-In-Logs	✅ Passed	PASS: The diff only removes CSV patching and renames env keys; added logging is just `echo $OVERRIDE_VAR`, with no passwords, tokens, PII, or hostnames introduced.

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

✨ 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

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

openshift-ci · 2026-06-25T12:15:50Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jotak

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:

~~ci-operator/config/netobserv/netobserv-operator/OWNERS~~ [jotak]
~~ci-operator/step-registry/netobserv/OWNERS~~ [jotak]

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

openshift-merge-bot · 2026-06-25T12:16:01Z

[REHEARSALNOTIFIER]
@jotak: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
pull-ci-netobserv-netobserv-web-console-main-integration-tests	netobserv/netobserv-web-console	presubmit	Registry content changed
pull-ci-netobserv-netobserv-web-console-main-pf5-pf5-integration-tests	netobserv/netobserv-web-console	presubmit	Registry content changed
pull-ci-netobserv-netobserv-web-console-main-pf4-pf4-integration-tests	netobserv/netobserv-web-console	presubmit	Registry content changed
pull-ci-netobserv-netobserv-ebpf-agent-main-qe-e2e-tests	netobserv/netobserv-ebpf-agent	presubmit	Registry content changed
pull-ci-netobserv-netobserv-operator-main-e2e-operator	netobserv/netobserv-operator	presubmit	Ci-operator config changed
pull-ci-netobserv-netobserv-operator-main-e2etest	netobserv/netobserv-operator	presubmit	Ci-operator config changed
pull-ci-netobserv-flowlogs-pipeline-main-qe-e2e-tests	netobserv/flowlogs-pipeline	presubmit	Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

openshift-ci · 2026-06-25T12:19:41Z

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

memodi · 2026-06-25T15:41:00Z

thanks @jotak, once the operator PR merges, lets run some rehearsals here.

memodi · 2026-06-29T16:54:51Z

/lgtm

/pj-rehearse ack

memodi · 2026-06-29T16:56:17Z

@jotak - once this is merged we confirm if e2e-operator test passes on PR netobserv/netobserv-operator#2822

netobserv: few env renamed; bundle now uses downstream config already

772bc4e

openshift-ci Bot requested review from OlivierCazade, jpinsonneau and memodi June 25, 2026 12:12

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 25, 2026

jotak mentioned this pull request Jun 25, 2026

NETOBSERV-2841: Refactor bundling for vendoring netobserv/netobserv-operator#2822

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

netobserv: few env renamed; bundle now uses downstream config already#81071

netobserv: few env renamed; bundle now uses downstream config already#81071
jotak wants to merge 1 commit into
openshift:mainfrom
jotak:env-rename

jotak commented Jun 25, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

jotak commented Jun 25, 2026

Uh oh!

coderabbitai Bot commented Jun 25, 2026 •

edited

Loading

❌ Failed checks (1 warning)

Uh oh!

openshift-ci Bot commented Jun 25, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 25, 2026

Uh oh!

openshift-ci Bot commented Jun 25, 2026

Uh oh!

memodi commented Jun 25, 2026

Uh oh!

memodi commented Jun 29, 2026

Uh oh!

memodi commented Jun 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

jotak commented Jun 25, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

jotak commented Jun 25, 2026

Uh oh!

coderabbitai Bot commented Jun 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

❌ Failed checks (1 warning)

Uh oh!

openshift-ci Bot commented Jun 25, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 25, 2026

Uh oh!

openshift-ci Bot commented Jun 25, 2026

Uh oh!

memodi commented Jun 25, 2026

Uh oh!

memodi commented Jun 29, 2026

Uh oh!

memodi commented Jun 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jotak commented Jun 25, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jun 25, 2026 •

edited

Loading