Skip to content

fix(otel-upstream): use opentelemetry-operator-system namespace in upstream step#79419

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:mainfrom
IshwarKanse:fix/otel-upstream-operator-namespace-20260518
May 19, 2026
Merged

fix(otel-upstream): use opentelemetry-operator-system namespace in upstream step#79419
openshift-merge-bot[bot] merged 4 commits into
openshift:mainfrom
IshwarKanse:fix/otel-upstream-operator-namespace-20260518

Conversation

@IshwarKanse
Copy link
Copy Markdown
Member

@IshwarKanse IshwarKanse commented May 18, 2026

Summary

Update the OpenTelemetry operator install namespace from `opentelemetry-operator` to `opentelemetry-operator-system` across the upstream CI step and job configs. This aligns with the change in open-telemetry/opentelemetry-operator#5085 which standardizes all OpenShift e2e tests to use `opentelemetry-operator-system` (the OLM default namespace).

Affected files

Step script:

  • `ci-operator/step-registry/distributed-tracing/tests/opentelemetry/upstream/distributed-tracing-tests-opentelemetry-upstream-commands.sh`
    • All `oc -n opentelemetry-operator` references updated to `oc -n opentelemetry-operator-system`

Job configs:

  • `openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml`
  • `openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml`
  • `openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml`
    • `oc create namespace`, `oc label namespace`, `operator-sdk run bundle -n`, `oc wait -n` and `PROJECT_NAME` updated

🤖 Generated with Claude Code

Summary

This PR updates OpenShift CI configuration and an upstream distributed-tracing step script in the openshift/release repository so OpenTelemetry upstream install and e2e test steps use the OLM-default namespace opentelemetry-operator-system instead of opentelemetry-operator.

What changed (practical effect)

  • Step-registry script:

    • ci-operator/step-registry/distributed-tracing/tests/opentelemetry/upstream/distributed-tracing-tests-opentelemetry-upstream-commands.sh
      • All oc -n ... references updated to target opentelemetry-operator-system.
      • The script now looks up the operator CSV in opentelemetry-operator-system and patches it in three phases to inject env vars for OPAMP bridge, metadata filters, and auto-instrumentation images; it waits and verifies the opentelemetry-operator-controller-manager deployment in opentelemetry-operator-system after each patch.
      • Chainsaw test invocations and the test flow remain the same; an any_errors flag is used to record failures.
  • Upstream job configs:

    • ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml
    • ...-4.21-amd64.yaml
    • ...-4.22-amd64.yaml
      • The install step now creates and labels the opentelemetry-operator-system namespace, runs operator-sdk run bundle -n opentelemetry-operator-system "$OO_BUNDLE", and waits for the controller-manager deployment in opentelemetry-operator-system.

Why

OLM now installs the OpenTelemetry operator into opentelemetry-operator-system by default (upstream change). Aligning CI install and test steps with the upstream default prevents tests from targeting the wrong namespace and failing.

Impact

  • Upstream OpenTelemetry CI jobs and the OTel upstream e2e step will install and interact with the operator in the OLM-managed opentelemetry-operator-system namespace, avoiding namespace mismatches.
  • Test logic, patches, and verification remain unchanged aside from the namespace switch; no behavioural changes to suites beyond using the correct namespace.

The OpenTelemetry Operator upstream e2e tests now install the operator
into opentelemetry-operator-system (the OLM default) instead of the old
opentelemetry-operator namespace. Update all oc -n and CSV patch
commands in the upstream step to match.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 18, 2026
@openshift-ci openshift-ci Bot requested review from frzifus and rubenvp8510 May 18, 2026 13:38
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 18, 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: 523635e4-d35e-4a49-9534-b5edca70b87e

📥 Commits

Reviewing files that changed from the base of the PR and between c531577 and 68e9ff0.

📒 Files selected for processing (1)
  • ci-operator/step-registry/distributed-tracing/tests/tempo/upstream/distributed-tracing-tests-tempo-upstream-commands.sh

Walkthrough

CI workflows and distributed-tracing test scripts were updated to use the opentelemetry-operator-system namespace for operator installation and CSV patching; Tempo test orchestration now aggregates failures across chainsaw test runs and runs TLS profile tests separately.

Changes

OpenTelemetry CSV Namespace Migration

Layer / File(s) Summary
CSV patching namespace updates across test phases
ci-operator/step-registry/distributed-tracing/tests/opentelemetry/upstream/distributed-tracing-tests-opentelemetry-upstream-commands.sh
Three CSV patch sections update the target namespace to opentelemetry-operator-system and configure environment variables for OPAMP bridge server (RELATED_IMAGE_TARGET_ALLOCATOR, RELATED_IMAGE_OPERATOR_OPAMP_BRIDGE), metadata filters (ANNOTATIONS_FILTER, LABELS_FILTER), and auto-instrumentation images (language/runtime-specific vars). Each phase applies patches, waits 60 seconds, and verifies opentelemetry-operator-controller-manager availability.
CI: 4.12 workflow install namespace
ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml
Install step creates and labels opentelemetry-operator-system, runs operator-sdk run bundle -n opentelemetry-operator-system, and waits for the controller-manager deployment in that namespace.
CI: 4.21 install namespace
ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml
Install step updated to create/label opentelemetry-operator-system, run bundle into it, and wait for the controller-manager deployment in that namespace.
CI: 4.22 install namespace
ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml
Installer rehearse commands updated to create/label and run the operator bundle in opentelemetry-operator-system, and wait for the opentelemetry-operator-controller-manager deployment there.
Tempo tests: error tracking and TLS isolation
ci-operator/step-registry/distributed-tracing/tests/tempo/upstream/distributed-tracing-tests-tempo-upstream-commands.sh
Add any_errors flag, capture failures from multiple chainsaw test runs (`

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Suggested labels

lgtm

Suggested reviewers

  • jerpeter1
  • weshayutin
🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: updating the OpenTelemetry operator namespace from 'opentelemetry-operator' to 'opentelemetry-operator-system' across multiple upstream CI configuration files and step scripts.
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 modifies CI configuration and orchestration scripts only. No Ginkgo test definitions (It(), Describe(), Context(), When()) exist in modified files, making the check non-applicable.
Test Structure And Quality ✅ Passed PR contains only shell scripts and YAML CI/CD configuration files. No Ginkgo test code (Go test files) was modified, making the Ginkgo test quality check not applicable.
Microshift Test Compatibility ✅ Passed PR modifies only CI/CD orchestration files (shell scripts, YAML configs). No new Ginkgo test definitions are added, so check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains no Ginkgo e2e test additions. Changes are to CI shell scripts and YAML configuration files only. The SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR contains CI configuration and test script changes only. No deployment manifests, operator code, or scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed OTE Binary Stdout Contract not applicable. PR modifies shell scripts and YAML CI config files, not Go test binaries that communicate JSON to openshift-tests.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. Only CI infrastructure changes (namespace updates, test execution order reorganization) present. Check not applicable.

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

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

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

IshwarKanse and others added 2 commits May 18, 2026 19:24
Update the operator install namespace from opentelemetry-operator to
opentelemetry-operator-system in the upstream OCP 4.12, 4.21, and 4.22
job configs. Aligns with the step script change and the upstream
operator repo standardization.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
PROJECT_NAME is consumed by the Snyk SAST step as the Snyk project
name, not as an OCP namespace. Revert the inadvertent rename.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@IshwarKanse
Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@IshwarKanse: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 19, 2026
The TLS profile tests patch the cluster-wide APIServer resource, triggering
node-level TLS reconciliation that disrupts concurrently running tests. Run
them as a separate chainsaw invocation after all other suites complete,
matching the same any_errors pattern used in the OTel upstream test step.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@IshwarKanse
Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@IshwarKanse: 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-openshift-open-telemetry-opentelemetry-operator-main-upstream-ocp-4.21-amd64-opentelemetry-upstream-tests openshift/open-telemetry-opentelemetry-operator presubmit Ci-operator config changed
pull-ci-openshift-open-telemetry-opentelemetry-operator-main-upstream-ocp-4.12-amd64-opentelemetry-upstream-tests openshift/open-telemetry-opentelemetry-operator presubmit Ci-operator config changed
pull-ci-openshift-open-telemetry-opentelemetry-operator-main-upstream-ocp-4.22-amd64-opentelemetry-upstream-tests openshift/open-telemetry-opentelemetry-operator presubmit Ci-operator config changed
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-merge-bot openshift-merge-bot Bot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 19, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@IshwarKanse: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 19, 2026
@kabirbhartiRH
Copy link
Copy Markdown
Contributor

/lgtm

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

openshift-ci Bot commented May 19, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: IshwarKanse, kabirbhartiRH

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

openshift-ci Bot commented May 19, 2026

@IshwarKanse: 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 62a0a71 into openshift:main May 19, 2026
16 checks passed
wgahnagl pushed a commit to wgahnagl/release that referenced this pull request May 20, 2026
…stream step (openshift#79419)

* fix(otel-upstream): use opentelemetry-operator-system namespace

The OpenTelemetry Operator upstream e2e tests now install the operator
into opentelemetry-operator-system (the OLM default) instead of the old
opentelemetry-operator namespace. Update all oc -n and CSV patch
commands in the upstream step to match.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(otel-upstream): use opentelemetry-operator-system in job configs

Update the operator install namespace from opentelemetry-operator to
opentelemetry-operator-system in the upstream OCP 4.12, 4.21, and 4.22
job configs. Aligns with the step script change and the upstream
operator repo standardization.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(otel-upstream): revert PROJECT_NAME to opentelemetry-operator

PROJECT_NAME is consumed by the Snyk SAST step as the Snyk project
name, not as an OCP namespace. Revert the inadvertent rename.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Run Tempo TLS profile tests last as an isolated chainsaw invocation

The TLS profile tests patch the cluster-wide APIServer resource, triggering
node-level TLS reconciliation that disrupts concurrently running tests. Run
them as a separate chainsaw invocation after all other suites complete,
matching the same any_errors pattern used in the OTel upstream test step.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants