Skip to content

Moving ObjectBucketClaim creation to ODF folder#807

Draft
jgato wants to merge 3 commits into
openshift-kni:mainfrom
jgato:obc-to-odf
Draft

Moving ObjectBucketClaim creation to ODF folder#807
jgato wants to merge 3 commits into
openshift-kni:mainfrom
jgato:obc-to-odf

Conversation

@jgato

@jgato jgato commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

OBC (ObjectBucketClaim) is a CR managed by ODF. So, unless we have installed ODF, the Manifest will never work.

The OBC was created to configure Thanos for Observability (MCO) storage. As it is now, we are making ACM dependent on ODF. If ODF is not installed, the OBC creation, that is in the ACM folder, cannot be created and Observability will never work.

With this PR, we make Observability Policy, that configures Thanos storage, to depend on existing CM and Secret with the S3 info. If you have ODF, these are created by the OBC, if not the user needs to provide them.

Note: I have changed ztp-site-generate and acm to version of release-4.21, just for testing purpose. We have to fix this if we agree to merge

@openshift-ci openshift-ci Bot requested review from MarSik and fedepaol June 11, 2026 10:09
@openshift-ci

openshift-ci Bot commented Jun 11, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jgato
Once this PR has been reviewed and has the lgtm label, please assign imiller0 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

@coderabbitai

coderabbitai Bot commented Jun 11, 2026

Copy link
Copy Markdown

Review Change Stack

Warning

Review limit reached

@jgato, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 32 minutes and 11 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more credits in the billing tab to continue.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

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 include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Enterprise

Run ID: c20c609b-8448-4552-a836-4a6aa31f2f38

📥 Commits

Reviewing files that changed from the base of the PR and between ebdf660 and 13c288d.

📒 Files selected for processing (7)
  • telco-hub/configuration/reference-crs-kube-compare/metadata.yaml
  • telco-hub/configuration/reference-crs-kube-compare/optional/odf-internal/observabilityOBC.yaml
  • telco-hub/configuration/reference-crs/optional/odf-internal/kustomization.yaml
  • telco-hub/configuration/reference-crs/optional/odf-internal/observabilityOBC.yaml
  • telco-hub/configuration/reference-crs/required/acm/kustomization.yaml
  • telco-hub/configuration/reference-crs/required/acm/readme.md
  • telco-hub/configuration/reference-crs/required/acm/thanosSecretPolicy.yaml
📝 Walkthrough

Walkthrough

This PR relocates the observability ObjectBucketClaim (OBC) resource from required ACM configuration to optional ODF internal storage, renames the resource from observability-obc to observability-ob, updates all configuration references and the consuming Thanos policy to use the renamed resource, and updates ArgoCD plugin policy container image versions.

Changes

ObjectBucketClaim Relocation and Renaming

Layer / File(s) Summary
OBC manifest relocation and resource renaming
telco-hub/configuration/reference-crs/optional/odf-internal/observabilityOBC.yaml, telco-hub/configuration/reference-crs-kube-compare/optional/odf-internal/observabilityOBC.yaml, telco-hub/configuration/reference-crs/optional/odf-internal/kustomization.yaml, telco-hub/configuration/reference-crs/required/acm/kustomization.yaml
ObjectBucketClaim metadata.name is renamed from observability-obc to observability-ob in both configuration and comparison artifacts. Kustomization files are updated to move the resource from required/acm to optional/odf-internal by removing the reference from ACM and adding it to ODF internal.
Metadata and policy updates for relocated OBC
telco-hub/configuration/reference-crs-kube-compare/metadata.yaml, telco-hub/configuration/reference-crs/required/acm/thanosSecretPolicy.yaml
The kube-compare metadata reference list is updated to remove the required/acm path and add the optional/odf-internal path for the OBC resource. The Thanos policy template updates its lookup calls to reference observability-object-bucket (the ConfigMap/Secret generated from the renamed OBC) instead of the previous observability-obc.

Container Image Version Updates

Layer / File(s) Summary
ArgoCD plugin policy image tag updates
telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml
Container image versions in the addPluginsPolicy initContainers are downgraded: ztp-site-generate-rhel8 from v4.22 to v4.21 and multicluster-operators-subscription-rhel9 from v2.17 to v2.16.

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately reflects the main change: moving ObjectBucketClaim from the ACM folder to the ODF folder, which is the primary refactoring described in the changeset.
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.
Description check ✅ Passed The PR description accurately describes the changeset: moving ObjectBucketClaim from ACM to ODF folder, decoupling ACM from ODF dependency, and making Observability depend on ConfigMap/Secret instead.

✏️ 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.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@telco-hub/configuration/reference-crs/required/acm/thanosSecretPolicy.yaml`:
- Around line 30-31: The template lookups for bucket credentials use variables
$objBucket and $awsAccess referencing the resource name
"observability-object-bucket", but the OBC actually creates resources under
metadata.name "observability-ob" (and omits spec.secretName/spec.configMapName),
so the lookup fails; fix by either changing the lookup keys to
"observability-ob" (update the lookup calls that set $objBucket and $awsAccess)
or by updating the OBC manifest to set spec.secretName and spec.configMapName to
"observability-object-bucket" so names align and $objBucket.data.* /
$awsAccess.data.* resolve.

In `@telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml`:
- Around line 78-80: The imageset-config mirror entries don’t match the
initContainer image tags used in addPluginsPolicy.yaml; update
telco-hub/install/mirror-registry/imageset-config.yaml so its additionalImages
list includes the exact tags used by
telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml (add
registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.21 and
registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.16), or
alternatively change the image references in addPluginsPolicy.yaml to the
currently mirrored tags; ensure you edit the additionalImages block in
imageset-config.yaml and include the exact image strings to guarantee the
disconnected mirror contains those tags.
🪄 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: Organization UI

Review profile: CHILL

Plan: Enterprise

Run ID: a5fde133-8efa-404b-9f31-c2d46a7c2c32

📥 Commits

Reviewing files that changed from the base of the PR and between fda0964 and ebdf660.

📒 Files selected for processing (7)
  • telco-hub/configuration/reference-crs-kube-compare/metadata.yaml
  • telco-hub/configuration/reference-crs-kube-compare/optional/odf-internal/observabilityOBC.yaml
  • telco-hub/configuration/reference-crs/optional/odf-internal/kustomization.yaml
  • telco-hub/configuration/reference-crs/optional/odf-internal/observabilityOBC.yaml
  • telco-hub/configuration/reference-crs/required/acm/kustomization.yaml
  • telco-hub/configuration/reference-crs/required/acm/thanosSecretPolicy.yaml
  • telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml
💤 Files with no reviewable changes (1)
  • telco-hub/configuration/reference-crs/required/acm/kustomization.yaml

OBC (ObjectBucketClaim) is a CR managed by ODF. So,
unless we have installed ODF, the Manifest will
never work.

This makes Observability Policy to depend on
existing CM and Secret with the S3 info. If you
have ODF these are created by the OBC, if not
the user needs to provide them.

Otherwise we are making ACM dependent on ODF. Now,
ACM depends on a CM/Secret.
@jgato jgato marked this pull request as draft June 11, 2026 10:39
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants