Skip to content

CNF-23556: CNF-23557: Restructure telco-ran - #849

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift-kni:mainfrom
irinamihai:restructure-telco-ran
Jul 23, 2026
Merged

openshift-merge-bot[bot] merged 2 commits into
openshift-kni:mainfrom
irinamihai:restructure-telco-ran

Conversation

@irinamihai

@irinamihai irinamihai commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Description:

  • Move acmpolicygenerator/ and policygentemplates/ from argocd/example/ to telco-ran/configuration/.
  • Rename PolicyGenerator files from acm--ranGen to ran- prefix.
  • Remove non-templated group policies from both directories — only hub-side-templated policies are retained.
  • Extract shared ConfigMaps into template-values/ referenced as a kustomization base by both directories.
  • Mark PolicyGenTemplate as deprecated in favor of PolicyGenerator.
  • Update all documentation, ArgoCD app paths, and CI references.

Co-Authored-By: Claude Opus 4.6 (1M context)

@openshift-ci-robot

openshift-ci-robot commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

@irinamihai: This pull request references CNF-23556 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Description:

  • Move acmpolicygenerator/ and policygentemplates/ from argocd/example/ to telco-ran/configuration/.
  • Rename PolicyGenerator files from acm--ranGen to ran- prefix.
  • Remove non-templated group policies from both directories — only hub-side-templated policies are retained.
  • Extract shared ConfigMaps into template-values/ referenced as a kustomization base by both directories.
  • Mark PolicyGenTemplate as deprecated in favor of PolicyGenerator.
  • Update all documentation, ArgoCD app paths, and CI references.

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
openshift-ci Bot requested review from SchSeba and yanirq July 7, 2026 20:11
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2026
@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review
📝 Walkthrough

Walkthrough

Moves PolicyGenerator content into new top-level configuration paths, updates validation and generation tooling for those paths, repoints Argo CD sources, and refreshes documentation plus example labels and manifests for the renamed layout and terminology.

Changes

PolicyGenerator directory restructure and tooling

Layer / File(s) Summary
Directory layout and kustomize wiring
telco-ran/configuration/acmpolicygenerator/kustomization.yaml, telco-ran/configuration/policygentemplates/kustomization.yaml, telco-ran/configuration/template-values/kustomization.yaml, telco-ran/configuration/README.md
Adds the new kustomization wiring for the top-level PolicyGenerator and PolicyGenTemplate directories and updates the reference configuration structure and deprecation notes for the new layout.
Build and path validation updates
Makefile, .yamllint.yaml, hack/test-kustomize.sh, telco-ran/configuration/Makefile, telco-ran/configuration/hack/checkpolicypaths.sh, .github/workflows/openapi-schema-check.yml
Updates schema generation/checks, lint exclusions, kustomize exclusions, and policy path validation to use the new directory locations and multi-base-directory checks.
Argo CD source path updates
telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml, telco-ran/configuration/argocd/deployment/policies-app.yaml, telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml, telco-ran/configuration/argocd/example/image-based-upgrades/README.md
Points the policies applications at telco-ran/configuration/acmpolicygenerator and switches the image-based-upgrades generator entry and docs to the PolicyGenerator-based file.
Documentation and example updates
telco-ran/configuration/argocd/README.md, telco-ran/configuration/argocd/SNOExpansion.md, telco-ran/configuration/argocd/WorkloadPartitioning.md, telco-ran/configuration/argocd/example/README.md, telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml, telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml, telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
Rewrites directory and workflow documentation for PolicyGenerator terminology, updates example instructions, and changes cluster label keys/comments to match the new binding rules.

Estimated code review effort: 4 (Complex) | ~45 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
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.
Title check ✅ Passed The title clearly reflects the main change: restructuring telco-ran.
Description check ✅ Passed The description matches the changeset and summarizes the directory move, renames, removals, and doc updates.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@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: 6

🤖 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-ran/configuration/argocd/example/clusterinstance/example-3node.yaml`:
- Around line 25-32: Update the example cluster labels in example-3node.yaml so
the comments and keys match the actual PolicyGenerator selectors used by the
acmpolicygenerator manifests. Specifically, adjust the label names referenced
around the example labels to use the real binding symbols for the 3-node group
and site selectors (for example, the labels tied to group-du-3nc-zone,
hardware-type, and site) rather than group-du-3node and sites, so copy-pasted
values will match PolicyGenerator bindingRules.

In `@telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml`:
- Around line 42-49: Update the example cluster labels in example-sno.yaml so
they match the actual PolicyGenerator selectors used by the manifests under
acmpolicygenerator; specifically, replace the mismatched group-du-sno and sites
references with the selector names used by the corresponding CRs
(group-du-sno-zone and site). Keep the surrounding comments aligned with the
corrected label keys so the example matches what PolicyGenerator bindingRules
expect.

In
`@telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml`:
- Around line 25-32: Update the example label comment block in
example-standard.yaml to use the current PolicyGenerator terminology instead of
the stale bindingRules wording. Also fix the relative reference so it points to
the moved top-level acmpolicygenerator directory rather than a path under
argocd. Keep the surrounding examples and labels the same, and ensure the
comment clearly directs readers to the correct PolicyGenerator CRs and schema.

In
`@telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml`:
- Around line 5-10: The kustomization is still carrying legacy OADP configMap
patching for the old policygentemplate flow, even though `ran-ibu-upgrade.yaml`
is now the active source. Remove the obsolete `patches` block from the
`kustomization.yaml` used by the image-based-upgrades example, and keep only the
`ran-ibu-upgrade.yaml` reference so the setup no longer includes leftover
`ibu-upgrade-ranGen.yaml` glue.

In `@telco-ran/configuration/argocd/example/image-based-upgrades/README.md`:
- Around line 85-86: The generators list still presents the legacy
PolicyGenTemplate example as the primary copy-paste option, while the prose now
favors the ACM PolicyGenerator path. Update the README entry that mentions
ran-ibu-upgrade.yaml and ibu-upgrade-ranGen.yaml so the PolicyGenerator example
is listed first and clearly promoted as the active recommendation, with the
legacy template secondary. Use the identifiers ran-ibu-upgrade.yaml,
ibu-upgrade-ranGen.yaml, and PolicyGenerator to locate the affected text.

In `@telco-ran/configuration/Makefile`:
- Around line 66-67: The checkPolicyPaths target only validates
acmpolicygenerator and argocd, so PolicyGenTemplate CRs under policygentemplates
are being skipped. Update the checkPolicyPaths rule in the Makefile to include
./policygentemplates/ alongside the existing paths, so the check script covers
those templates as well.
🪄 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: 8504d8b7-2ee4-4125-9e9f-a0730e9a8dc7

📥 Commits

Reviewing files that changed from the base of the PR and between 820708d and 9a3fcbb.

📒 Files selected for processing (65)
  • .github/workflows/openapi-schema-check.yml
  • .yamllint.yaml
  • Makefile
  • hack/test-kustomize.sh
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/Makefile
  • telco-ran/configuration/README.md
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/acmpolicygenerator/ns.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common-mno.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-multinode-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-reboot.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-sno-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-clo5-cleanup.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/README.md
  • telco-ran/configuration/argocd/SNOExpansion.md
  • telco-ran/configuration/argocd/WorkloadPartitioning.md
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/argocd/example/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/ran-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/policygentemplates/common-mno-ranGen.yaml
  • telco-ran/configuration/policygentemplates/common-ranGen.yaml
  • telco-ran/configuration/policygentemplates/example-multinode-site.yaml
  • telco-ran/configuration/policygentemplates/example-reboot.yaml
  • telco-ran/configuration/policygentemplates/example-sno-site.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-clo5-cleanup-policy.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • telco-ran/configuration/policygentemplates/ns.yaml
  • telco-ran/configuration/template-values/group-hardware-types-configmap.yaml
  • telco-ran/configuration/template-values/group-zones-configmap.yaml
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/template-values/site-data-configmap.yaml
💤 Files with no reviewable changes (14)
  • .yamllint.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml

Comment thread telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml Outdated
Comment thread telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml Outdated
Comment thread telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml Outdated
Comment thread telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml Outdated
Comment thread telco-ran/configuration/argocd/example/image-based-upgrades/README.md Outdated
Comment thread telco-ran/configuration/Makefile Outdated
@irinamihai
irinamihai force-pushed the restructure-telco-ran branch from 9a3fcbb to b47de68 Compare July 8, 2026 15:27

@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: 4

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
Makefile (1)

133-142: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Move the schema diff into a helper script.

The check-openapi-schemas recipe is 8 lines long now, which exceeds the repo's enforced checkmake body limit and will fail linting. A one-line wrapper around a helper script keeps the target within the configured limit.

♻️ Proposed fix
 check-openapi-schemas: generate-openapi-schemas  ## Verify schema.openapi files are up-to-date
-	`@if` ! git diff --exit-code hack/crd-schema-config.json \
-		telco-ran/configuration/acmpolicygenerator/schema.openapi \
-		telco-core/configuration/schema.openapi; then \
-		echo ""; \
-		echo "ERROR: OpenAPI schema files are out of date."; \
-		echo "Run 'make generate-openapi-schemas' and commit the result."; \
-		exit 1; \
-	fi
+	./hack/check-openapi-schemas.sh
🤖 Prompt for 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.

In `@Makefile` around lines 133 - 142, The check-openapi-schemas target body is
too long for the repo’s checkmake limit, so move the git diff and error संदेश
into a helper script and keep the Makefile recipe as a one-line wrapper. Add the
new helper alongside the existing schema generation tooling, then update
check-openapi-schemas in the Makefile to invoke that script after
generate-openapi-schemas, preserving the same exit behavior and message output.

Source: Linters/SAST tools

♻️ Duplicate comments (1)
telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml (1)

25-27: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

"bindingRules" wording still stale (path fix applied, terminology not).

The relative path to acmpolicygenerator/ was corrected, but the comments still say "bindingRules", which is legacy PolicyGenTemplate terminology — PolicyGenerator uses placement.labelSelector, not bindingRules.

✏️ Suggested wording fix
-      # These example cluster labels correspond to the bindingRules in the PolicyGenerator examples
+      # These example cluster labels correspond to the PolicyGenerator selector examples
@@
-      # These example cluster labels correspond to the bindingRules in the PolicyGenerator CRs in ../../../acmpolicygenerator/:
+      # These example cluster labels correspond to the PolicyGenerator CRs in ../../../acmpolicygenerator/:
🤖 Prompt for 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.

In `@telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml`
around lines 25 - 27, Update the stale comments in the example cluster instance
YAML to use PolicyGenerator terminology instead of “bindingRules”; in the
comment near the `du-profile` label and the reference to the PolicyGenerator
examples, replace “bindingRules” with wording that matches
`placement.labelSelector` and keep the corrected `acmpolicygenerator/` path
reference consistent.
🤖 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-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml`:
- Around line 5-10: The trailing comment in kustomization.yaml is
self-contradictory because acm-pg-ran-ibu-upgrade.yaml is already the active
generator, so update the note to refer to removal of the legacy
pgt-ibu-upgrade.yaml instead. Keep the change focused on the existing generator
list and the deprecation note near the pgt-ibu-upgrade.yaml reference so the
comment accurately reflects the real cleanup condition.

In `@telco-ran/configuration/argocd/README.md`:
- Around line 423-425: The fenced error snippet in the README example is missing
a language label, which triggers markdownlint MD040. Update the example block to
use a plain text fence so the renderer treats it as output; adjust the fenced
snippet under the kustomize error example in the README comment section, keeping
the rest of the example unchanged.

In `@telco-ran/configuration/argocd/WorkloadPartitioning.md`:
- Around line 22-23: The markdown link in WorkloadPartitioning references a YAML
line using a plain fragment that will not jump to the intended location. Update
the link that points to the `reserved` example in
`ran-group-du-sno-templated.yaml` to use a GitHub line anchor format like
`#L128` (or a permalink) so the reference lands on the correct section; keep the
surrounding `PerformanceProfile-SetSelector` reference intact.

In `@telco-ran/configuration/README.md`:
- Around line 16-17: Add the required blank line after the “## Deprecation
notice” heading in the README so the markdown satisfies MD022; update the
deprecation notice section in the README to place one empty line between the
heading and the paragraph that follows.

---

Outside diff comments:
In `@Makefile`:
- Around line 133-142: The check-openapi-schemas target body is too long for the
repo’s checkmake limit, so move the git diff and error संदेश into a helper
script and keep the Makefile recipe as a one-line wrapper. Add the new helper
alongside the existing schema generation tooling, then update
check-openapi-schemas in the Makefile to invoke that script after
generate-openapi-schemas, preserving the same exit behavior and message output.

---

Duplicate comments:
In
`@telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml`:
- Around line 25-27: Update the stale comments in the example cluster instance
YAML to use PolicyGenerator terminology instead of “bindingRules”; in the
comment near the `du-profile` label and the reference to the PolicyGenerator
examples, replace “bindingRules” with wording that matches
`placement.labelSelector` and keep the corrected `acmpolicygenerator/` path
reference consistent.
🪄 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: f653135a-cc34-4dae-87f8-9ed00278a2eb

📥 Commits

Reviewing files that changed from the base of the PR and between 9a3fcbb and b47de68.

📒 Files selected for processing (66)
  • .github/workflows/openapi-schema-check.yml
  • .yamllint.yaml
  • Makefile
  • hack/test-kustomize.sh
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/Makefile
  • telco-ran/configuration/README.md
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/acmpolicygenerator/ns.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common-mno.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-multinode-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-reboot.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-sno-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-clo5-cleanup.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/README.md
  • telco-ran/configuration/argocd/SNOExpansion.md
  • telco-ran/configuration/argocd/WorkloadPartitioning.md
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/argocd/example/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/argocd/example/image-based-upgrades/acm-pg-ran-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/pgt-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/policygentemplates/common-mno-ranGen.yaml
  • telco-ran/configuration/policygentemplates/common-ranGen.yaml
  • telco-ran/configuration/policygentemplates/example-multinode-site.yaml
  • telco-ran/configuration/policygentemplates/example-reboot.yaml
  • telco-ran/configuration/policygentemplates/example-sno-site.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-clo5-cleanup-policy.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • telco-ran/configuration/policygentemplates/ns.yaml
  • telco-ran/configuration/template-values/group-hardware-types-configmap.yaml
  • telco-ran/configuration/template-values/group-zones-configmap.yaml
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/template-values/site-data-configmap.yaml
💤 Files with no reviewable changes (13)
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
✅ Files skipped from review due to trivial changes (4)
  • telco-ran/configuration/argocd/example/README.md
  • .github/workflows/openapi-schema-check.yml
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
🚧 Files skipped from review as they are similar to previous changes (8)
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • .yamllint.yaml
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • hack/test-kustomize.sh
  • telco-ran/configuration/argocd/SNOExpansion.md

Comment thread telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml Outdated
Comment thread telco-ran/configuration/argocd/README.md
Comment thread telco-ran/configuration/argocd/WorkloadPartitioning.md Outdated
Comment thread telco-ran/configuration/README.md
@irinamihai
irinamihai force-pushed the restructure-telco-ran branch 2 times, most recently from 7a9345e to 62d664a Compare July 8, 2026 16:02

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
Makefile (1)

133-142: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Collapse this recipe so it passes checkmake.

checkmake already flags this target as exceeding the repo's 5-line body limit, so this block is likely to fail lint as written. Move the diff check into a small helper script or shorten the shell block.

🤖 Prompt for 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.

In `@Makefile` around lines 133 - 142, The check-openapi-schemas recipe in the
Makefile exceeds the repo’s shell-body limit and will fail checkmake as written.
Shorten this target by moving the git diff validation and error handling into a
small helper script or reusable make target, then keep check-openapi-schemas as
a thin wrapper that calls it while preserving the current behavior and message
flow.

Source: Linters/SAST tools

🤖 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.

Outside diff comments:
In `@Makefile`:
- Around line 133-142: The check-openapi-schemas recipe in the Makefile exceeds
the repo’s shell-body limit and will fail checkmake as written. Shorten this
target by moving the git diff validation and error handling into a small helper
script or reusable make target, then keep check-openapi-schemas as a thin
wrapper that calls it while preserving the current behavior and message flow.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Enterprise

Run ID: 2561b59f-1dee-4aad-89aa-0b46f8a73626

📥 Commits

Reviewing files that changed from the base of the PR and between 7a9345e and 62d664a.

📒 Files selected for processing (66)
  • .github/workflows/openapi-schema-check.yml
  • .yamllint.yaml
  • Makefile
  • hack/test-kustomize.sh
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/Makefile
  • telco-ran/configuration/README.md
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/acmpolicygenerator/ns.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common-mno.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-multinode-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-reboot.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-sno-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-clo5-cleanup.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/README.md
  • telco-ran/configuration/argocd/SNOExpansion.md
  • telco-ran/configuration/argocd/WorkloadPartitioning.md
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/argocd/example/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/argocd/example/image-based-upgrades/acm-pg-ran-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/pgt-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/policygentemplates/common-mno-ranGen.yaml
  • telco-ran/configuration/policygentemplates/common-ranGen.yaml
  • telco-ran/configuration/policygentemplates/example-multinode-site.yaml
  • telco-ran/configuration/policygentemplates/example-reboot.yaml
  • telco-ran/configuration/policygentemplates/example-sno-site.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-clo5-cleanup-policy.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • telco-ran/configuration/policygentemplates/ns.yaml
  • telco-ran/configuration/template-values/group-hardware-types-configmap.yaml
  • telco-ran/configuration/template-values/group-zones-configmap.yaml
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/template-values/site-data-configmap.yaml
💤 Files with no reviewable changes (13)
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
✅ Files skipped from review due to trivial changes (6)
  • telco-ran/configuration/argocd/example/README.md
  • .github/workflows/openapi-schema-check.yml
  • telco-ran/configuration/Makefile
  • hack/test-kustomize.sh
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/policygentemplates/kustomization.yaml
🚧 Files skipped from review as they are similar to previous changes (11)
  • telco-ran/configuration/template-values/kustomization.yaml
  • .yamllint.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/argocd/SNOExpansion.md

@irinamihai

Copy link
Copy Markdown
Contributor Author

/retest

@irinamihai
irinamihai force-pushed the restructure-telco-ran branch from 62d664a to 4c01121 Compare July 8, 2026 19:29
@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

@irinamihai: This pull request references CNF-23556 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Description:

  • Move acmpolicygenerator/ and policygentemplates/ from argocd/example/ to telco-ran/configuration/.
  • Rename PolicyGenerator files from acm--ranGen to ran- prefix.
  • Remove non-templated group policies from both directories — only hub-side-templated policies are retained.
  • Extract shared ConfigMaps into template-values/ referenced as a kustomization base by both directories.
  • Mark PolicyGenTemplate as deprecated in favor of PolicyGenerator.
  • Update all documentation, ArgoCD app paths, and CI references.

Co-Authored-By: Claude Opus 4.6 (1M context)

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.

irinamihai added a commit to irinamihai/cnf-features-deploy that referenced this pull request Jul 8, 2026
…lco-ran/configuration

Description:
- Update paths after acmpolicygenerator/ and policygentemplates/ moved
  from argocd/example/ up to telco-ran/configuration/ root, and
  template-values/ was extracted as a new shared directory.
- Container layout places the moved dirs at /home/ztp root with
  backward-compat symlinks from the old argocd/example/ paths.

  Depends on: openshift-kni/telco-reference#849

  Co-Authored-By: Claude Opus 4.6 (1M context)

@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: 1

🤖 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-ran/configuration/argocd/README.md`:
- Around line 210-221: The PolicyGenerator setup steps use incorrect relative
paths from within the argocd README, so the referenced example directory and
supporting files won’t resolve. Update the path references in this section to
point to the sibling acmpolicygenerator directory (and its ns.yaml and
kustomization.yaml) relative to the current README location, keeping the rest of
the setup guidance unchanged.
🪄 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: 7df2928c-58a6-430a-b8b7-0a5a32cd1bfe

📥 Commits

Reviewing files that changed from the base of the PR and between 62d664a and 4c01121.

📒 Files selected for processing (66)
  • .github/workflows/openapi-schema-check.yml
  • .yamllint.yaml
  • Makefile
  • hack/test-kustomize.sh
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/Makefile
  • telco-ran/configuration/README.md
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/acmpolicygenerator/ns.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common-mno.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-common.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-multinode-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-reboot.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-example-sno-site.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-3node-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-clo5-cleanup.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-sno-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-templated.yaml
  • telco-ran/configuration/acmpolicygenerator/ran-group-du-standard-validator.yaml
  • telco-ran/configuration/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/README.md
  • telco-ran/configuration/argocd/SNOExpansion.md
  • telco-ran/configuration/argocd/WorkloadPartitioning.md
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/argocd/example/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/argocd/example/image-based-upgrades/acm-pg-ran-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/pgt-ibu-upgrade.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/policygentemplates/common-mno-ranGen.yaml
  • telco-ran/configuration/policygentemplates/common-ranGen.yaml
  • telco-ran/configuration/policygentemplates/example-multinode-site.yaml
  • telco-ran/configuration/policygentemplates/example-reboot.yaml
  • telco-ran/configuration/policygentemplates/example-sno-site.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-3node-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-clo5-cleanup-policy.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-sno-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-ranGen-templated.yaml
  • telco-ran/configuration/policygentemplates/group-du-standard-validator-ranGen.yaml
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • telco-ran/configuration/policygentemplates/ns.yaml
  • telco-ran/configuration/template-values/group-hardware-types-configmap.yaml
  • telco-ran/configuration/template-values/group-zones-configmap.yaml
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/template-values/site-data-configmap.yaml
💤 Files with no reviewable changes (13)
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-zones-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/site-data-configmap.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/configMaps/group-hardware-types-configmap.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/schema.openapi
  • telco-ran/configuration/argocd/example/policygentemplates/kustomization.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/kustomization.yaml
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/README.md
  • telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
  • telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
✅ Files skipped from review due to trivial changes (4)
  • telco-ran/configuration/policygentemplates/kustomization.yaml
  • .yamllint.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/README.md
  • telco-ran/configuration/argocd/example/README.md
🚧 Files skipped from review as they are similar to previous changes (13)
  • telco-ran/configuration/template-values/kustomization.yaml
  • telco-ran/configuration/acmpolicygenerator/kustomization.yaml
  • .github/workflows/openapi-schema-check.yml
  • telco-hub/configuration/reference-crs/required/gitops/ztp-installation/policies-app.yaml
  • telco-ran/configuration/argocd/deployment/policies-app.yaml
  • telco-ran/configuration/argocd/example/image-based-upgrades/kustomization.yaml
  • telco-ran/configuration/argocd/example/clusterinstance/example-sno.yaml
  • telco-ran/configuration/Makefile
  • telco-ran/configuration/argocd/example/clusterinstance/example-standard.yaml
  • telco-ran/configuration/hack/checkpolicypaths.sh
  • telco-ran/configuration/argocd/example/clusterinstance/example-3node.yaml
  • telco-ran/configuration/argocd/SNOExpansion.md
  • hack/test-kustomize.sh

Comment thread telco-ran/configuration/argocd/README.md
@irinamihai
irinamihai force-pushed the restructure-telco-ran branch 2 times, most recently from 86ebb73 to 9e7da9e Compare July 9, 2026 22:09
Description:
- Move acmpolicygenerator/ and policygentemplates/ from argocd/example/
  to telco-ran/configuration/.
- Rename PolicyGenerator files from acm-*-ranGen to ran-* prefix.
- Remove non-templated group policies from both directories — only
  hub-side-templated policies are retained.
- Extract shared ConfigMaps into template-values/ referenced as a
  kustomization base by both directories.
- Mark PolicyGenTemplate as deprecated in favor of PolicyGenerator.
- Update all documentation, ArgoCD app paths, and CI references.

Co-Authored-By: Claude Opus 4.6 (1M context)
@irinamihai
irinamihai force-pushed the restructure-telco-ran branch from 9e7da9e to 55fa2e6 Compare July 9, 2026 22:23
repoURL: https://github.com/openshift-kni/cnf-features-deploy
path: telco-ran/configuration/acmpolicygenerator
repoURL: https://github.com/openshift-kni/telco-reference
targetRevision: master

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Target revision is main in telco-reference

# - pgt-ibu-upgrade.yaml
```

When `ibu-upgrade-ranGen.yaml` is used, override the oadp configmap data field with hub template using the Kustomize patches.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
When `ibu-upgrade-ranGen.yaml` is used, override the oadp configmap data field with hub template using the Kustomize patches.
When `acm-pg-ibu-upgrade.yaml` is used, override the oadp configmap data field with hub template using the Kustomize patches.

@irinamihai

Copy link
Copy Markdown
Contributor Author

/cc @imiller0

@openshift-ci
openshift-ci Bot requested a review from imiller0 July 22, 2026 16:52
Comment thread telco-ran/configuration/README.md Outdated
- `policygentemplates/` contains deprecated PolicyGenTemplate (PGT) equivalents of the hub-side-templated group policies, provided for reference only.
- `source-crs/` contains the CRs which form the foundation of the RAN reference configuration.
- `template-values/` contains ConfigMaps used by hub-side templating to inject hardware-type, zone, and site-specific values into policies.
- `extra-manifests-builder/` is used to create the extra-manifests in `source-crs/extra-manifest/` directory.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is being moved out of here to telco-ran/install directory in #826
We can leave this line out of the readme


resources:
- ns.yaml
- ../template-values

@abraham2512 abraham2512 Jul 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Kustomize blocks path references outside the kustomization root by default - so this might fail in argo 🤔

https://kubernetes.io/docs/reference/kubectl/generated/kubectl_kustomize/
docs under load-restrictor arg

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This works as template-values acts as its own base, so kustomize will build all of it. (kustomize example here).

### Deploying a worker node ###

1. Assuming your cluster was deployed using [this ClusterInstance CR](example/clusterinstance/example-sno.yaml), add your new worker node to `spec.clusters['example-sno'].nodes` list, for example:
1. Assuming your cluster was deployed using [this ClusterInstance CR](example/clusterinstance/example-sno.yaml), add your new worker node to `spec.clusters['cnfdf15'].nodes` list, for example:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should we keep this actual cluster name 'cnfdf15'?

@irinamihai irinamihai Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ah, right! Will rename.

Comment on lines +13 to +15
# Site-level examples — replicate for every individual site
- ran-example-sno-site.yaml
- ran-example-multinode-site.yaml

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

With templated models are these still relevant? ideally with templating there would be no per-site policies.

@irinamihai irinamihai Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Correct, the SRIOV config within these files is already templated inside the group PGs. They can be safely removed.

Comment thread telco-ran/configuration/acmpolicygenerator/kustomization.yaml

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

There is good content in here that I think is still relevant. Should this be moved/preserved as well?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm, I think we can keep the PolicyGenerator portions under telco-ran/configuration/acmpolicygenerator/README.md

Comment on lines +34 to +35
sites: "example-multinode"
site: "example-multinode"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is this same rename done in the example PolicyGenerator? (or maybe this is obsolete if we don't have per site polcies?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This will be removed anyway together with the site policies.

Comment on lines +51 to +52
sites: "example-sno"
site: "example-sno"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Same as above

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This will be removed anyway together with the site policies.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is there a reason this is left under the argocd/example directory when the other PGs were moved to telco-ran/configuration/...?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I initially kept it because it's a different flow than the Day 2 DU profile, but I think it can still be under the acmpolicygenerator/, since it has its own directory and README.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm, I wonder if it would make more sense to have this directly under telco-ran/configuration. It's a quick change if you prefer we moved it. Kindly let me know.

@imiller0 imiller0 Jul 23, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You make a good point that this isn't really configuration per-se, but rather policies in support of day-2 operations. I'm ok with either location but we should discuss how we would like to organize these operational procedures. We have the same issue in Core RDS where we simply mix the operational (eg upgrades) PG in the same directory as the config pg. For now leaving here is fine.

Comment on lines +17 to +19
# Site-level examples — replicate for every individual site
- example-sno-site.yaml
- example-multinode-site.yaml

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Same comment. With templating these should no longer be needed

@irinamihai
irinamihai force-pushed the restructure-telco-ran branch from 841336b to 8643ca3 Compare July 23, 2026 17:13

@imiller0 imiller0 left a comment

Copy link
Copy Markdown
Collaborator

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 Jul 23, 2026
@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: imiller0, irinamihai

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:
  • OWNERS [imiller0,irinamihai]

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
openshift-merge-bot Bot merged commit 90ea6af into openshift-kni:main Jul 23, 2026
7 checks passed
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants