Skip to content

openshift-logging: Rename tag of mirrored api and opa-openshift images#80857

Open
xperimental wants to merge 1 commit into
openshift:mainfrom
xperimental:log-storage-mirror
Open

openshift-logging: Rename tag of mirrored api and opa-openshift images#80857
xperimental wants to merge 1 commit into
openshift:mainfrom
xperimental:log-storage-mirror

Conversation

@xperimental

@xperimental xperimental commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

This PR renames the images for observatorium-api and opa-openshift that we currently mirror from their upstream builds. They currently use a mirror-5.y name which is inaccurate since Logging went from major version 5 to 6. I have chosen to omit the version number and use main instead, because these components are not versioned together with our releases.

The 5.8/5.9 builds are end-of-life and only exist for sustaining engineering. These releases use a different branch of the upstream projects, which is currently not built anywhere. The current configuration should still allow the CI to pass, although the images do not correspond with the versions used in the production build.

/cc @JoaoBraveCoding
/assign @xperimental

Summary by CodeRabbit

This PR updates the CI configuration for OpenShift Logging (Loki) to rename image tags for two mirrored components: lokistack-gateway (observatorium-api) and opa-openshift.

What changed:

  • In 7 CI operator configuration files (main, 5.8, 5.9, 6.0, 6.2, 6.4, 6.5), the base_images entries for both components were updated to use the main tag instead of the previous mirror-5.y naming scheme with version-specific tags
  • The image-mirroring configuration was updated to reflect the new tag naming: moving from logging/mirror-5.y:lokistack-gateway|opa-openshift to logging/lokistack-gateway|opa-openshift:main

Why it matters:
These are "unversioned" components that don't follow the main Loki release cycle, so using main tags instead of versioned tags (like mirror-5.y) is more accurate. This affects CI builds across both end-of-life branches (5.8, 5.9) and active releases (6.0 through 6.5). While 5.8 and 5.9 are sustaining engineering releases that may not have exact upstream builds, the change maintains CI compatibility across all branches.

@coderabbitai

coderabbitai Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

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: 88912a1b-a03b-43c6-93b7-2edcabe67b3b

📥 Commits

Reviewing files that changed from the base of the PR and between 18915e1 and 0acb389.

📒 Files selected for processing (8)
  • ci-operator/config/openshift/loki/openshift-loki-main.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml
  • ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml
  • core-services/image-mirroring/_config.yaml

Walkthrough

The image mirroring config renames lokistack-gateway and opa-openshift mirror keys from logging/mirror-5.y:* to logging/lokistack-gateway:main and logging/opa-openshift:main. All seven loki CI operator configs (main, 5.8, 5.9, 6.0, 6.2, 6.4, 6.5) are updated to reference the renamed image streams with tag: main.

Changes

Loki Image Mirror Rename

Layer / File(s) Summary
Image mirroring config key rename
core-services/image-mirroring/_config.yaml
Renames logging/mirror-5.y:lokistack-gateway and logging/mirror-5.y:opa-openshift mirror keys to logging/lokistack-gateway:main and logging/opa-openshift:main, preserving the associated destination image values.
CI operator base_images updates across all loki branches
ci-operator/config/openshift/loki/openshift-loki-main.yaml, ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml, ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml, ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml, ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml, ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml, ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml
Updates base_images entries for lokistack-gateway and opa-openshift in all loki CI operator configs to use name: loki-stack-gateway / name: opa-openshift with tag: main, replacing prior name: mirror-5.y and product-specific tag values.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

lgtm, approved, rehearsals-ack

Suggested reviewers

  • jcantrill
  • deepsm007
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 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: renaming image tags from mirror-5.y to main for api and opa-openshift images across multiple configuration files.
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 PR modifies only CI/CD configuration YAML files, not test code. No Ginkgo test patterns or test titles present in the changes.
Test Structure And Quality ✅ Passed Pull request contains only YAML CI/CD configuration changes, not Ginkgo test code. The custom check for Ginkgo test quality is not applicable.
Microshift Test Compatibility ✅ Passed PR contains only YAML configuration changes (image tags and base images); no new Ginkgo e2e tests are added, making this check not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR; only YAML configuration files for CI operator and image mirroring are modified. SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed This PR modifies only CI operator configuration and image mirroring configuration files. No deployment manifests, operator code, or controllers are changed, so the topology-aware scheduling check i...
Ote Binary Stdout Contract ✅ Passed PR only modifies YAML configuration files (ci-operator configs and image mirroring configs). No executable Go code, test code, or OTE binaries are modified, so the stdout contract cannot be violated.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR contains only YAML configuration file changes; no new Ginkgo e2e tests are added. Check requirement (new tests) does not apply.
No-Weak-Crypto ✅ Passed Pull request modifies only YAML CI/CD configuration files with no cryptographic code or weak crypto patterns (MD5, SHA1, DES, RC4, etc.) present.
Container-Privileges ✅ Passed No container or K8s manifests with privilege-related settings found; modified files are CI operator configs and image mirroring configs only.
No-Sensitive-Data-In-Logs ✅ Passed PR contains only YAML configuration changes for image tagging. No code, logging statements, or sensitive data are 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 and usage tips.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@xperimental: 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-loki-main-build openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-main-ci-index-loki-operator-bundle openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-main-images openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-main-lint openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-main-test openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-main-test-operator openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-build openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-ci-index-loki-operator-bundle openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-images openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-lint openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-test openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.9-test-operator openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-build openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-ci-index-loki-operator-bundle openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-images openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-lint openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-test openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.4-test-operator openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-build openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-ci-index-loki-operator-bundle openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-images openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-lint openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-test openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-6.0-test-operator openshift/loki presubmit Ci-operator config changed
pull-ci-openshift-loki-release-5.8-build openshift/loki presubmit Ci-operator config changed

A total of 42 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
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.

@xperimental

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-loki-main-build

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@JoaoBraveCoding JoaoBraveCoding left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2026
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: JoaoBraveCoding, xperimental
Once this PR has been reviewed and has the lgtm label, please assign jmguzik for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@xperimental

Copy link
Copy Markdown
Contributor Author

/pj-rehearse auto-ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@xperimental

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-loki-release-6.5-ci-index-loki-operator-bundle
/pj-rehearse pull-ci-openshift-loki-release-6.5-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@xperimental: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@xperimental

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-loki-release-6.5-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@xperimental: 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/rehearse/openshift/loki/release-6.5/ci-index-loki-operator-bundle 0acb389 link unknown /pj-rehearse pull-ci-openshift-loki-release-6.5-ci-index-loki-operator-bundle
ci/rehearse/openshift/loki/release-6.5/images 0acb389 link unknown /pj-rehearse pull-ci-openshift-loki-release-6.5-images

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants