OCPBUGS-76243: Update FBCs v4.12-v4.21 with v1.1.2 stage bundle#421
Conversation
openshift-ci-robot
added
jira/severity-important
|
@grzpiotrowski: This pull request references Jira Issue OCPBUGS-76243, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 32 minutes and 46 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (20)
📝 WalkthroughWalkthroughThis pull request introduces 🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 9
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (3)
catalog/v4.13/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🔴 CriticalCritical:
external-dns-operator.v1.1.2bundle stub is declared twice in the template.Lines 93–95 and lines 105–107 both register an
olm.bundleentry withname: external-dns-operator.v1.1.2pointing to the same stage image digest. A template with duplicate bundle names produces a catalog with duplicate bundle records;opm alpha render-template basic(and downstreamopm validate) will fail or silently produce a malformed catalog. Only one entry should remain.This same duplication is present in all v4.12–v4.19 catalog templates (v4.20–v4.21 are already correct with a single entry). The root cause is likely in the generation step feeding these templates — fixing it here should be paired with re-running generation for every affected catalog in the PR.
Proposed fix — keep only one v1.1.2 bundle stub
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:d2a425d6338586f6f17e00b175c5f86843a58afa6d9ccc1d58c87d2851fd2538 name: external-dns-operator.v1.1.0 schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:b02bab3af52a2469ced96618f1d122464568ba21ebc0a3a945b78ec4e6bdc80d name: external-dns-operator.v1.1.1 schema: olm.bundle - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f name: external-dns-operator.v1.1.2 schema: olm.bundle(Apply the equivalent deletion in every other
catalog/v4.*/catalog-template.yamland regenerate the renderedcatalog.yamlfiles.)🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.13/catalog-template.yaml` around lines 93 - 107, The template contains a duplicate bundle stub "external-dns-operator.v1.1.2" (image sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) declared twice; remove the redundant entry so only one olm.bundle entry with name external-dns-operator.v1.1.2 remains in catalog-template.yaml (and apply the same deletion across the v4.12–v4.19 catalog templates that show this duplication), then re-run the catalog/template generation to regenerate the rendered catalog.yaml files.catalog/v4.16/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🟡 MinorDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.The same bundle entry (same name, same stage image digest) is declared twice in this template — once at Lines 93–95 (inserted between v1.0.0 and v1.0.1) and again at Lines 105–107 (between v1.1.1 and v1.2.0). The flat-style sibling template
catalog/v4.21/catalog-template.yamldeclares it only once. The generatedcatalog.yamlcurrently appears to deduplicate, but the template itself is inconsistent and the first insertion is out of version order.🔧 Proposed fix — remove the duplicate at Lines 93–95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.16/catalog-template.yaml` around lines 93 - 107, Remove the duplicate bundle entry for external-dns-operator.v1.1.2 (the block with image digest sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f and schema olm.bundle) that was inserted earlier out of version order; keep the single correct occurrence (the later v1.1.2 block) so the template lists each bundle exactly once and versions remain in proper order.catalog/v4.14/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🟡 MinorDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.Same issue as in
catalog/v4.16/catalog-template.yaml: the v1.1.2 bundle is declared twice (Lines 93–95 and Lines 105–107). The first insertion is also out of version order (between v1.0.0 and v1.0.1). Please remove the duplicate and regenerate.🔧 Proposed fix — remove the duplicate at Lines 93–95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.14/catalog-template.yaml` around lines 93 - 107, Remove the duplicate olm.bundle entry for external-dns-operator.v1.1.2: locate the repeated block with name: external-dns-operator.v1.1.2 and image referencing the sha256:e7573d00... and delete the earlier duplicate (the one out of version order), then regenerate the catalog so bundles are in correct ascending version order (ensure sequence includes v1.0.1, v1.1.0, v1.1.1, v1.1.2 only once).
♻️ Duplicate comments (4)
catalog/v4.12/catalog-template.yaml (1)
93-95:⚠️ Potential issue | 🔴 CriticalDuplicate
external-dns-operator.v1.1.2bundle entry — remove the one at lines 93-95.Same issue as
catalog/v4.15/catalog-template.yaml:schema: olm.bundleforv1.1.2is declared twice in the flat list — once misplaced betweenv1.0.0andv1.0.1(lines 93-95), and once correctly placed betweenv1.1.1andv1.2.0(lines 105-107). Rendering will produce two identicalolm.bundleobjects andopm validatewill fail.Compare with
catalog/v4.20/catalog-template.yaml, which has only one correctly-placed entry.🐛 Proposed fix — delete lines 93-95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundleRegenerate
catalog/v4.12/catalog.yamlafterwards.Also applies to: 105-107
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.12/catalog-template.yaml` around lines 93 - 95, Remove the duplicate bundle entry for external-dns-operator.v1.1.2 that has "schema: olm.bundle" (the misplaced block between v1.0.0 and v1.0.1); keep the correctly placed external-dns-operator.v1.1.2 entry between v1.1.1 and v1.2.0, delete the earlier lines that repeat the same name/image/schema, and then regenerate catalog/v4.12/catalog.yaml so the catalog no longer contains two identical olm.bundle objects.catalog/v4.19/catalog-template.yaml (1)
93-95:⚠️ Potential issue | 🔴 CriticalDuplicate
external-dns-operator.v1.1.2bundle entry — remove the one at lines 93-95.Same duplicate pattern seen in
catalog/v4.12/catalog-template.yamlandcatalog/v4.15/catalog-template.yaml:v1.1.2is registered twice (93-95 misplaced betweenv1.0.0/v1.0.1, and again at 105-107 in the correct position). This likely also explains the duplicate full bundle definition incatalog/v4.18/catalog.yaml(lines 1651-2044 and 2046-2439) if the same generation step was used there.Remove lines 93-95 and re-render any dependent
catalog.yaml.🐛 Proposed fix — delete lines 93-95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundleAlso applies to: 105-107
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.19/catalog-template.yaml` around lines 93 - 95, Remove the misplaced duplicate bundle entry for external-dns-operator.v1.1.2 (the block containing image registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f and name external-dns-operator.v1.1.2) from catalog-template.yaml so only the correct listing (the other external-dns-operator.v1.1.2 block) remains; after removing that duplicate block, re-run the catalog generation/render step that produces the dependent catalog.yaml so the duplicate full bundle definition is eliminated.catalog/v4.17/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🟡 MinorDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.Same issue as in other nested-style templates in this PR: v1.1.2 bundle is declared twice (Lines 93–95 and Lines 105–107), with the first insertion out of version order. Please remove the duplicate and regenerate.
🔧 Proposed fix — remove the duplicate at Lines 93–95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.17/catalog-template.yaml` around lines 93 - 107, Remove the duplicate olm.bundle entry for external-dns-operator.v1.1.2: locate the repeated block with name: external-dns-operator.v1.1.2 (image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f, schema: olm.bundle) and delete the earlier/out-of-order occurrence so only the correct v1.1.2 bundle remains once, then regenerate the template to ensure entries are in proper version order.catalog/v4.18/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🟡 MinorDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.Same issue as in other nested-style templates in this PR: v1.1.2 bundle is declared twice (Lines 93–95 and Lines 105–107), with the first insertion out of version order. Please remove the duplicate and regenerate.
🔧 Proposed fix — remove the duplicate at Lines 93–95
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.18/catalog-template.yaml` around lines 93 - 107, Remove the duplicate olm.bundle entry for external-dns-operator.v1.1.2 by deleting the earlier block that references name: external-dns-operator.v1.1.2 (the one using image registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) so only the correctly ordered v1.1.2 bundle remains; after removing that duplicate block, regenerate the template to ensure ordering and hashes are consistent.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@catalog/v4.15/catalog-template.yaml`:
- Around line 93-95: Remove the duplicated bundle entry for
external-dns-operator.v1.1.2 found in the flat entries list (the spurious
image/name/schema block that appears between the v1.0.0 and v1.0.1 entries),
leaving only the correct occurrence that sits between v1.1.1 and v1.2.0; after
deleting that duplicate block for external-dns-operator.v1.1.2, regenerate the
catalog/v4.15/catalog.yaml so the rendered catalog contains a single, correctly
ordered bundle entry.
In `@catalog/v4.17/catalog.yaml`:
- Around line 1650-2440: There are two identical olm.bundle entries for the
bundle named "external-dns-operator.v1.1.2" (image digest
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) causing
duplicate bundle errors; remove the duplicated bundle declaration from the
catalog template (the duplicate block in the catalog-template that emits the
"external-dns-operator.v1.1.2" bundle), re-render the catalogs, and verify
catalogs v4.12 through v4.19 no longer contain two
"external-dns-operator.v1.1.2" olm.bundle entries.
In `@catalog/v4.18/catalog.yaml`:
- Around line 1650-2045: The catalog contains a duplicate olm.bundle entry for
the bundle named external-dns-operator.v1.1.2 (image digest
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f and
schema: olm.bundle); remove the redundant v1.1.2 bundle reference from the
catalog-template's flat bundle list (the duplicate that generates the second
external-dns-operator.v1.1.2 block), regenerate the rendered catalog so there is
only one schema: olm.bundle entry for external-dns-operator.v1.1.2, and re-run
opm validate/opm render to confirm the duplication is gone.
- Line 1651: The bundle image for version v1.1.2 and its referenced images point
to the staging registry; either confirm this is intended for staging only or
replace all occurrences of registry.stage.redhat.io with registry.redhat.io for
the v1.1.2 bundle image string (the image entry with sha256:e7573d00...), and
for all relatedImages and containerImage entries under the v1.1.2 manifest (look
for keys named relatedImages and containerImage) so the catalog references
production registry.redhat.io instead of registry.stage.redhat.io before
merging.
In `@catalog/v4.19/catalog.yaml`:
- Around line 1651-1652: Update all references to registry.stage.redhat.io to
registry.redhat.io in this bundle: replace the bundle image entry (the image:
field referencing sha256), the containerImage annotation (containerImage in the
CSV), and all relatedImages entries (the four relatedImages lines referenced) so
they point to registry.redhat.io; after swapping registries verify and refresh
the image digests (sha256) if they differ and update the corresponding digest
values so the manifest remains consistent.
- Around line 2045-2047: There is a duplicate olm.bundle document for the bundle
name external-dns-operator.v1.1.2 (identical image and CSV payload); remove the
redundant olm.bundle document so only one bundle with name:
external-dns-operator.v1.1.2 remains in catalog.yaml, and apply the same removal
to the corresponding duplicate in every catalog-template.yaml and catalog/v4.* /
catalog.yaml for versions v4.12–v4.21 to ensure each bundle name is unique per
package (search for the second occurrence of the olm.bundle block whose image
references
registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d00... and
delete that entire duplicate document).
In `@catalog/v4.20/catalog.yaml`:
- Around line 1651-2044: The bundle references for external-dns-operator.v1.1.2
are pointing to the staging registry (registry.stage.redhat.io), which will
break image pulls; update the top-level image: field for the bundle and the
relatedImages entries (names: kube-rbac-proxy, external-dns-rhel8-operator,
external-dns-operator, external_dns) to point to the production registry
(registry.redhat.io) instead of registry.stage.redhat.io so the bundle and
related images resolve correctly in production; ensure all occurrences of
registry.stage.redhat.io in the external-dns-operator.v1.1.2 block are changed
to registry.redhat.io.
In `@catalog/v4.21/catalog.yaml`:
- Around line 1973-1984: The CSV annotations for v1.1.2 differ from v1.1.1:
specifically check features.operators.openshift.io/fips-compliant and the
restoration of operators.openshift.io/infrastructure-features and
operators.openshift.io/valid-subscription; fetch the upstream CSV for the v1.1.2
bundle (sha256:e7573d00…) and confirm whether the FIPS flag was intentionally
changed to "true" and whether the two operators.openshift.io annotations are
present upstream; if the upstream CSV does not match this file, revert the
annotations to match upstream (or correct values from v1.1.1) in the CSV here
(the block containing features.operators.openshift.io/fips-compliant,
operators.openshift.io/infrastructure-features,
operators.openshift.io/valid-subscription) and add a short commit note
explaining the restoration or correction.
- Around line 1651-2044: This bundle references registry.stage.redhat.io in
fields image, containerImage and multiple relatedImages for package
external-dns-operator.v1.1.2; update those entries so the catalog does not
contain stage registry refs by either (a) replacing them with the production
registry host and correct digests, or (b) if replacement is handled by CI, add a
clear TODO comment and link to the tracking issue for the rewrite automation
immediately above the image/containerImage/relatedImages blocks (image,
containerImage, relatedImages, and package: external-dns-operator.v1.1.2) so no
stage refs reach shipped catalog branches without automated rewriting. Ensure
the change is applied consistently across all affected OCP versions and mention
which pipeline/job performs digest rewriting in the TODO or link.
---
Outside diff comments:
In `@catalog/v4.13/catalog-template.yaml`:
- Around line 93-107: The template contains a duplicate bundle stub
"external-dns-operator.v1.1.2" (image
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f)
declared twice; remove the redundant entry so only one olm.bundle entry with
name external-dns-operator.v1.1.2 remains in catalog-template.yaml (and apply
the same deletion across the v4.12–v4.19 catalog templates that show this
duplication), then re-run the catalog/template generation to regenerate the
rendered catalog.yaml files.
In `@catalog/v4.14/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate olm.bundle entry for
external-dns-operator.v1.1.2: locate the repeated block with name:
external-dns-operator.v1.1.2 and image referencing the sha256:e7573d00... and
delete the earlier duplicate (the one out of version order), then regenerate the
catalog so bundles are in correct ascending version order (ensure sequence
includes v1.0.1, v1.1.0, v1.1.1, v1.1.2 only once).
In `@catalog/v4.16/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate bundle entry for
external-dns-operator.v1.1.2 (the block with image digest
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f and
schema olm.bundle) that was inserted earlier out of version order; keep the
single correct occurrence (the later v1.1.2 block) so the template lists each
bundle exactly once and versions remain in proper order.
---
Duplicate comments:
In `@catalog/v4.12/catalog-template.yaml`:
- Around line 93-95: Remove the duplicate bundle entry for
external-dns-operator.v1.1.2 that has "schema: olm.bundle" (the misplaced block
between v1.0.0 and v1.0.1); keep the correctly placed
external-dns-operator.v1.1.2 entry between v1.1.1 and v1.2.0, delete the earlier
lines that repeat the same name/image/schema, and then regenerate
catalog/v4.12/catalog.yaml so the catalog no longer contains two identical
olm.bundle objects.
In `@catalog/v4.17/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate olm.bundle entry for
external-dns-operator.v1.1.2: locate the repeated block with name:
external-dns-operator.v1.1.2 (image:
registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f,
schema: olm.bundle) and delete the earlier/out-of-order occurrence so only the
correct v1.1.2 bundle remains once, then regenerate the template to ensure
entries are in proper version order.
In `@catalog/v4.18/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate olm.bundle entry for
external-dns-operator.v1.1.2 by deleting the earlier block that references name:
external-dns-operator.v1.1.2 (the one using image
registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f)
so only the correctly ordered v1.1.2 bundle remains; after removing that
duplicate block, regenerate the template to ensure ordering and hashes are
consistent.
In `@catalog/v4.19/catalog-template.yaml`:
- Around line 93-95: Remove the misplaced duplicate bundle entry for
external-dns-operator.v1.1.2 (the block containing image
registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f
and name external-dns-operator.v1.1.2) from catalog-template.yaml so only the
correct listing (the other external-dns-operator.v1.1.2 block) remains; after
removing that duplicate block, re-run the catalog generation/render step that
produces the dependent catalog.yaml so the duplicate full bundle definition is
eliminated.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 1d1fbd0b-937a-4fa7-bbd8-ab6c5cba9ba7
📒 Files selected for processing (20)
catalog/v4.12/catalog-template.yamlcatalog/v4.12/catalog.yamlcatalog/v4.13/catalog-template.yamlcatalog/v4.13/catalog.yamlcatalog/v4.14/catalog-template.yamlcatalog/v4.14/catalog.yamlcatalog/v4.15/catalog-template.yamlcatalog/v4.15/catalog.yamlcatalog/v4.16/catalog-template.yamlcatalog/v4.16/catalog.yamlcatalog/v4.17/catalog-template.yamlcatalog/v4.17/catalog.yamlcatalog/v4.18/catalog-template.yamlcatalog/v4.18/catalog.yamlcatalog/v4.19/catalog-template.yamlcatalog/v4.19/catalog.yamlcatalog/v4.20/catalog-template.yamlcatalog/v4.20/catalog.yamlcatalog/v4.21/catalog-template.yamlcatalog/v4.21/catalog.yaml
| image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f | ||
| name: external-dns-operator.v1.1.2 |
There was a problem hiding this comment.
Reminder: registry.stage.redhat.io references must be promoted to registry.redhat.io before GA.
The PR title makes clear this is intentionally the stage bundle (OCPBUGS-76243), but the bundle image, containerImage annotation (L1971), and three of the four relatedImages entries (L2036, L2038, L2040, L2042) all still point at registry.stage.redhat.io. Please ensure a follow-up PR swaps these to registry.redhat.io (and refreshes digests if they differ) before this bundle is rolled into production FBCs — disconnected/mirroring users cannot resolve registry.stage.redhat.io.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@catalog/v4.19/catalog.yaml` around lines 1651 - 1652, Update all references
to registry.stage.redhat.io to registry.redhat.io in this bundle: replace the
bundle image entry (the image: field referencing sha256), the containerImage
annotation (containerImage in the CSV), and all relatedImages entries (the four
relatedImages lines referenced) so they point to registry.redhat.io; after
swapping registries verify and refresh the image digests (sha256) if they differ
and update the corresponding digest values so the manifest remains consistent.
|
/jira refresh |
|
@alebedev87: This pull request references Jira Issue OCPBUGS-76243, which is invalid:
Comment DetailsIn response to this:
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. |
|
/jira refresh |
|
@alebedev87: This pull request references Jira Issue OCPBUGS-76243, which is invalid:
Comment DetailsIn response to this:
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. |
|
/jira refresh |
openshift-ci-robot
added
the
jira/valid-bug
|
@alebedev87: This pull request references Jira Issue OCPBUGS-76243, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
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
removed
the
jira/invalid-bug
grzpiotrowski
force-pushed
the
edo-1-1-2-update-fbc-stage
branch
from
2ec9481 to
9f3360e
Compare
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (4)
catalog/v4.12/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🔴 CriticalDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.Same bug as
catalog/v4.13/catalog-template.yaml: the v1.1.2 bundle is declared twice (lines 93-95 and lines 105-107) with identical image digest and bundle name. This will produce a malformed/non-deterministic rendered catalog. Remove the first duplicate at lines 93-95; the entry at 105-107 is in the correct position.🧰 Proposed fix
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.12/catalog-template.yaml` around lines 93 - 107, Remove the duplicate bundle entry with name "external-dns-operator.v1.1.2" and image digest "sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f" that appears earlier in the bundles list; keep the later occurrence (the correct one) and ensure only one "external-dns-operator.v1.1.2" olm.bundle entry remains in the catalog-template.yaml so the rendered catalog is deterministic.catalog/v4.13/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🔴 CriticalDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.The same bundle is declared twice in the bundle listing: once at lines 93-95 (inserted between
v1.0.0andv1.0.1) and again at lines 105-107 (betweenv1.1.1andv1.2.0). Both reference the identical image digest and use the same bundlename. Rendering this template withopm alpha render-template basicwill produce a catalog with duplicate bundle blobs for the same package/version — this either fails validation or yields a non-deterministic FBC. Only the second placement (lines 105-107, matching the version ordering) should remain.🧰 Proposed fix
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.13/catalog-template.yaml` around lines 93 - 107, The bundle external-dns-operator.v1.1.2 (image sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) is declared twice; remove the earlier duplicate entry (the one inserted between v1.0.0 and v1.0.1) and keep only the later, correctly ordered declaration (the entry between v1.1.1 and v1.2.0) so the bundle list is unique and version-ordered.catalog/v4.16/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🔴 CriticalDuplicate
olm.bundleentry forexternal-dns-operator.v1.1.2.Same duplicate-bundle bug as in
catalog/v4.12/v4.13templates — v1.1.2 is declared at both lines 93-95 and 105-107. Drop the first stray copy; the one at 105-107 is in the correct position.🧰 Proposed fix
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundle🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.16/catalog-template.yaml` around lines 93 - 107, Remove the duplicate bundle entry for external-dns-operator.v1.1.2: locate the two occurrences of the olm.bundle entry named external-dns-operator.v1.1.2 and delete the first/stale one (the earlier image block), keeping the correct entry (the later image block) intact so only a single external-dns-operator.v1.1.2 olm.bundle entry remains.catalog/v4.18/catalog-template.yaml (1)
93-107:⚠️ Potential issue | 🔴 CriticalRemove duplicate
olm.bundleentry forexternal-dns-operator.v1.1.2from template.The template contains an identical v1.1.2 bundle at both lines 93–95 and 105–107 (same image SHA256). While the rendered
catalog/v4.18/catalog.yamlcurrently also contains both duplicates (due to faithful template rendering), the template source should not carry duplicate bundle entries. Remove the stray entry at lines 93–95.🧰 Proposed fix
- image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:9a81303e7ea9a43f1791d80d1c4a9196bb59425fd3a15a1dd342d8ae8d6b981c name: external-dns-operator.v1.0.0 schema: olm.bundle - - image: registry.stage.redhat.io/edo/external-dns-operator-bundle@sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f - name: external-dns-operator.v1.1.2 - schema: olm.bundle - image: registry.redhat.io/edo/external-dns-operator-bundle@sha256:0a86a1808d9906eb57886d3d3cd5c04cf9578a80860342132d36ecfc411bf807 name: external-dns-operator.v1.0.1 schema: olm.bundleAfter applying the fix, re-run the template render (
make generate-catalog) and verify the rendered catalog no longer contains duplicate v1.1.2 entries. Consider adding a CI check that renders templates and validates for duplicate bundle names to prevent this pattern across all catalog versions.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@catalog/v4.18/catalog-template.yaml` around lines 93 - 107, Remove the duplicate bundle entry for external-dns-operator.v1.1.2 (image sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) from the catalog template by deleting the redundant block that contains image/name/schema for external-dns-operator.v1.1.2, leaving only the single intended v1.1.2 bundle entry; after the change re-run make generate-catalog and verify the rendered catalog has only one external-dns-operator.v1.1.2 entry, and consider adding a CI check that renders templates and fails on duplicate bundle names to prevent regressions.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@catalog/v4.12/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate bundle entry with name
"external-dns-operator.v1.1.2" and image digest
"sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f" that
appears earlier in the bundles list; keep the later occurrence (the correct one)
and ensure only one "external-dns-operator.v1.1.2" olm.bundle entry remains in
the catalog-template.yaml so the rendered catalog is deterministic.
In `@catalog/v4.13/catalog-template.yaml`:
- Around line 93-107: The bundle external-dns-operator.v1.1.2 (image
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) is
declared twice; remove the earlier duplicate entry (the one inserted between
v1.0.0 and v1.0.1) and keep only the later, correctly ordered declaration (the
entry between v1.1.1 and v1.2.0) so the bundle list is unique and
version-ordered.
In `@catalog/v4.16/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate bundle entry for
external-dns-operator.v1.1.2: locate the two occurrences of the olm.bundle entry
named external-dns-operator.v1.1.2 and delete the first/stale one (the earlier
image block), keeping the correct entry (the later image block) intact so only a
single external-dns-operator.v1.1.2 olm.bundle entry remains.
In `@catalog/v4.18/catalog-template.yaml`:
- Around line 93-107: Remove the duplicate bundle entry for
external-dns-operator.v1.1.2 (image
sha256:e7573d0076a72f04f70418033f6b15c3f5b18dc02e46b67ae7de9ab3878d322f) from
the catalog template by deleting the redundant block that contains
image/name/schema for external-dns-operator.v1.1.2, leaving only the single
intended v1.1.2 bundle entry; after the change re-run make generate-catalog and
verify the rendered catalog has only one external-dns-operator.v1.1.2 entry, and
consider adding a CI check that renders templates and fails on duplicate bundle
names to prevent regressions.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: ea1143fa-b9a4-45a1-b341-cd13682d5d2d
📒 Files selected for processing (20)
catalog/v4.12/catalog-template.yamlcatalog/v4.12/catalog.yamlcatalog/v4.13/catalog-template.yamlcatalog/v4.13/catalog.yamlcatalog/v4.14/catalog-template.yamlcatalog/v4.14/catalog.yamlcatalog/v4.15/catalog-template.yamlcatalog/v4.15/catalog.yamlcatalog/v4.16/catalog-template.yamlcatalog/v4.16/catalog.yamlcatalog/v4.17/catalog-template.yamlcatalog/v4.17/catalog.yamlcatalog/v4.18/catalog-template.yamlcatalog/v4.18/catalog.yamlcatalog/v4.19/catalog-template.yamlcatalog/v4.19/catalog.yamlcatalog/v4.20/catalog-template.yamlcatalog/v4.20/catalog.yamlcatalog/v4.21/catalog-template.yamlcatalog/v4.21/catalog.yaml
✅ Files skipped from review due to trivial changes (2)
- catalog/v4.19/catalog-template.yaml
- catalog/v4.18/catalog.yaml
🚧 Files skipped from review as they are similar to previous changes (5)
- catalog/v4.20/catalog-template.yaml
- catalog/v4.15/catalog-template.yaml
- catalog/v4.17/catalog.yaml
- catalog/v4.17/catalog-template.yaml
- catalog/v4.14/catalog-template.yaml
|
Issue with double entries of the bundle. Fixing now |
Add external-dns-operator `v1.1.2` bundle from the stage registry (`registry.stage.redhat.io/edo`) to all FBC catalog templates and regenerate catalogs for OCP versions `4.12` through `4.21`. The `v1.1.2` entry is added to the `stable-v1` and `stable-v1.2` channels, replacing `v1.1.1`, while `v1.2.0` now replaces `v1.1.2`
grzpiotrowski
force-pushed
the
edo-1-1-2-update-fbc-stage
branch
from
9f3360e to
a6997b5
Compare
|
@grzpiotrowski: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
Deploy pipelines didn't deploy, checking whether it's a catchup of the mirroring change. /retest UPD: deploy operator pipeline uses the default bundle channel by default which prevents 1.2 and 1.1 channel updates from reaching deployment tasks. |
|
/lgtm The deployment gap described in the comment can be addressed later. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alebedev87 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
|
@grzpiotrowski: Jira Issue OCPBUGS-76243: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-76243 has been moved to the MODIFIED state. DetailsIn response to this:
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. |
3 participants
Add external-dns-operator
v1.1.2bundle from the stage registry (registry.stage.redhat.io/edo) to all FBC catalog templates and regenerate catalogs for OCP versions4.12through4.21.The
v1.1.2entry is added to thestable-v1andstable-v1.2channels, replacingv1.1.1, whilev1.2.0now replacesv1.1.2