Skip to content

OCPBUGS-62684: telco-ran: remove crun extra-manifests and complete extra-manifests reorg - #883

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift-kni:mainfrom
irinamihai:telco-ran-cleanup
Jul 31, 2026
Merged

OCPBUGS-62684: telco-ran: remove crun extra-manifests and complete extra-manifests reorg#883
openshift-merge-bot[bot] merged 1 commit into
openshift-kni:mainfrom
irinamihai:telco-ran-cleanup

Conversation

@irinamihai

@irinamihai irinamihai commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@openshift-ci
openshift-ci Bot requested review from ffromani and imiller0 July 30, 2026 18:55
@openshift-ci-robot

Copy link
Copy Markdown
Collaborator

@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is invalid:

  • expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.22" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In 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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2026
@coderabbitai

coderabbitai Bot commented Jul 30, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

ClusterInstance install manifests

Layer / File(s) Summary
ClusterInstance manifest layout
telco-ran/configuration/argocd/AdditionalManifests.md, telco-ran/configuration/source-crs/optional-extra-manifest/README.md, telco-ran/install/README.md, telco-ran/install/clusterinstance/custom-manifests/README.md
Documentation moves reference and optional install manifests under install/clusterinstance/ and describes ClusterInstance.spec.extraManifestsRefs usage.
MachineConfig templates
telco-ran/install/clusterinstance/extra-manifests/*.tmpl
Adds templates for TPM2/NBDE disk encryption and role-scoped image registry partitions.
CRUN validation removal
telco-ran/configuration/compare.sh, telco-ran/configuration/kube-compare-reference/{hack/compare_ignore,metadata.yaml}
Removes CRUN manifests from install-time content, required references, ignore rules, and comparison checks.

Estimated code review effort: 2 (Simple) | ~15 minutes

Suggested reviewers: kchennag

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Description check ❓ Inconclusive No pull request description was provided, so there is nothing to validate against the changeset. Add a brief description summarizing the main changes and affected paths.
✅ Passed checks (4 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 and concisely describes the removal of crun extra manifests and completion of the extra-manifests reorganization.
✨ 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: 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/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl`:
- Around line 1-10: Update the template around the .Data.Nodes iteration to emit
exactly one role-level MachineConfig for each $.Role. Aggregate the partition
information from all partitioned nodes before rendering, or explicitly reject
conflicting per-node inputs; do not render the same
98-var-imageregistry-partition-{{ $.Role }} manifest repeatedly without
separators.
🪄 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: bcfa60b7-8305-49e8-a244-f5591f8d29a5

📥 Commits

Reviewing files that changed from the base of the PR and between f9edd30 and f3f4c66.

📒 Files selected for processing (14)
  • telco-ran/configuration/argocd/AdditionalManifests.md
  • telco-ran/configuration/compare.sh
  • telco-ran/configuration/kube-compare-reference/hack/compare_ignore
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yaml
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yaml
  • telco-ran/configuration/kube-compare-reference/metadata.yaml
  • telco-ran/configuration/source-crs/optional-extra-manifest/README.md
  • telco-ran/install/README.md
  • telco-ran/install/clusterinstance/custom-manifests/README.md
  • telco-ran/install/clusterinstance/extra-manifests/disk-encryption.yaml.tmpl
  • telco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl
  • telco-ran/install/custom-manifests/README.md
  • telco-ran/install/custom-manifests/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/enable-crun-worker.yaml
💤 Files with no reviewable changes (8)
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yaml
  • telco-ran/install/custom-manifests/enable-crun-worker.yaml
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/README.md
  • telco-ran/configuration/kube-compare-reference/metadata.yaml
  • telco-ran/configuration/kube-compare-reference/hack/compare_ignore
  • telco-ran/configuration/compare.sh

@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

Inline review comments failed to post. This is likely due to GitHub's internal server error or limits when posting large numbers of comments. If you are seeing this consistently it is likely a permissions issue. Please check "Moderation" -> "Code review limits" under your organization settings.

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/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl`:
- Around line 1-10: Update the template around the .Data.Nodes iteration to emit
exactly one role-level MachineConfig for each $.Role. Aggregate the partition
information from all partitioned nodes before rendering, or explicitly reject
conflicting per-node inputs; do not render the same
98-var-imageregistry-partition-{{ $.Role }} manifest repeatedly without
separators.
🪄 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: bcfa60b7-8305-49e8-a244-f5591f8d29a5

📥 Commits

Reviewing files that changed from the base of the PR and between f9edd30 and f3f4c66.

📒 Files selected for processing (14)
  • telco-ran/configuration/argocd/AdditionalManifests.md
  • telco-ran/configuration/compare.sh
  • telco-ran/configuration/kube-compare-reference/hack/compare_ignore
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yaml
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yaml
  • telco-ran/configuration/kube-compare-reference/metadata.yaml
  • telco-ran/configuration/source-crs/optional-extra-manifest/README.md
  • telco-ran/install/README.md
  • telco-ran/install/clusterinstance/custom-manifests/README.md
  • telco-ran/install/clusterinstance/extra-manifests/disk-encryption.yaml.tmpl
  • telco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl
  • telco-ran/install/custom-manifests/README.md
  • telco-ran/install/custom-manifests/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/enable-crun-worker.yaml
💤 Files with no reviewable changes (8)
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yaml
  • telco-ran/install/custom-manifests/enable-crun-worker.yaml
  • telco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/enable-crun-master.yaml
  • telco-ran/install/custom-manifests/README.md
  • telco-ran/configuration/kube-compare-reference/metadata.yaml
  • telco-ran/configuration/kube-compare-reference/hack/compare_ignore
  • telco-ran/configuration/compare.sh
🛑 Comments failed to post (1)
telco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl (1)

1-10: 🎯 Functional Correctness | 🟠 Major | 🏗️ Heavy lift

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Locate the template's callers and installation-data shapes to confirm whether
# multiple nodes can carry DiskPartition data for one rendered role.
rg -n -C 4 'image-registry-partition-mc\.yaml\.tmpl|DiskPartition|\.Data\.Nodes' telco-ran

Repository: openshift-kni/telco-reference

Length of output: 6771


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- template ---'
cat -n telco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl | sed -n '1,120p'

echo '--- DiskPartition references ---'
rg -n -C 3 'DiskPartition|Data\.Nodes|image-registry-partition-mc\.yaml\.tmpl' telco-ran/install telco-ran/configuration | sed -n '1,220p'

echo '--- ClusterInstance node examples ---'
rg -n -C 4 'nodes:|role:|DiskPartition:' telco-ran/install/clusterinstance telco-ran/configuration | sed -n '1,260p'

Repository: openshift-kni/telco-reference

Length of output: 32505


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- DiskPartitionContainers doc ---'
fd -a 'DiskPartitionContainers.md' telco-ran
echo '--- image-registry partition template full ---'
cat -n telco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl | sed -n '1,220p'

echo '--- related example snippets ---'
rg -n -C 4 'DiskPartition|image-registry-partition-mc|MachineConfig' telco-ran/configuration telco-ran/install/clusterinstance | sed -n '1,260p'

Repository: openshift-kni/telco-reference

Length of output: 29798


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- DiskPartitionContainers.md ---'
cat -n telco-ran/configuration/argocd/DiskPartitionContainers.md | sed -n '1,260p'

echo '--- DiskPartition type definition / fields ---'
rg -n -C 3 'type .*DiskPartition|DiskPartition struct|DiskPartition\b' telco-ran | sed -n '1,260p'

echo '--- extra-manifests-builder call sites ---'
rg -n -C 4 'extra-manifests-builder|Data.Nodes|Role' telco-ran | sed -n '1,260p'

Repository: openshift-kni/telco-reference

Length of output: 40085


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- builder and schema hits ---'
rg -n -C 4 'DiskPartition|Data\.Nodes|extra-manifests-builder|ClusterInstance' telco-ran/install/extra-manifests-builder telco-ran/install/clusterinstance telco-ran/install | sed -n '1,320p'

echo '--- file inventory for builder ---'
git ls-files telco-ran/install/extra-manifests-builder telco-ran/install/clusterinstance | sed -n '1,240p'

Repository: openshift-kni/telco-reference

Length of output: 36814


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- extra-manifests-builder Makefile ---'
cat -n telco-ran/install/extra-manifests-builder/Makefile | sed -n '1,220p'

echo '--- extra-manifests-builder README ---'
cat -n telco-ran/install/extra-manifests-builder/README.md | sed -n '1,260p'

echo '--- image-registry build.sh ---'
cat -n telco-ran/install/extra-manifests-builder/99-sync-time-once/build.sh | sed -n '1,220p'

echo '--- disk-encryption build.sh ---'
cat -n telco-ran/install/extra-manifests-builder/01-disk-encryption-pcr-rebind/build.sh | sed -n '1,220p'

Repository: openshift-kni/telco-reference

Length of output: 6958


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- extra-manifests-builder Makefile ---'
cat -n telco-ran/install/extra-manifests-builder/Makefile | sed -n '1,220p'

echo '--- extra-manifests-builder README ---'
cat -n telco-ran/install/extra-manifests-builder/README.md | sed -n '1,260p'

echo '--- 99-sync-time-once build.sh ---'
cat -n telco-ran/install/extra-manifests-builder/99-sync-time-once/build.sh | sed -n '1,220p'

echo '--- 01-disk-encryption-pcr-rebind build.sh ---'
cat -n telco-ran/install/extra-manifests-builder/01-disk-encryption-pcr-rebind/build.sh | sed -n '1,220p'

Repository: openshift-kni/telco-reference

Length of output: 6975


Emit a single role-level MachineConfig here. This loop walks .Data.Nodes, so multiple partitioned nodes in the same role will render 98-var-imageregistry-partition-{{ $.Role }} more than once, with no --- separator. That leaves duplicate/ambiguous manifests; aggregate the partition data first or reject mixed per-node inputs.

🤖 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/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpl`
around lines 1 - 10, Update the template around the .Data.Nodes iteration to
emit exactly one role-level MachineConfig for each $.Role. Aggregate the
partition information from all partitioned nodes before rendering, or explicitly
reject conflicting per-node inputs; do not render the same
98-var-imageregistry-partition-{{ $.Role }} manifest repeatedly without
separators.

@irinamihai

Copy link
Copy Markdown
Contributor Author

/cc @abraham2512

@openshift-ci
openshift-ci Bot requested a review from abraham2512 July 30, 2026 19:21
@irinamihai

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown
Collaborator

@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (bazem@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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

Copy link
Copy Markdown
Collaborator

@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (bazem@redhat.com), skipping review request.

Details

In response to this:

RAN only:

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.

@@ -4,9 +4,9 @@ Assisted Installer allows CRs to be applied to SNOs at install time. The applied

With this feature, via ClusterInstance, users can now have control over this process and can inject manifets during installation by creating a configMap in a Kustomization file and later reference back the configMap name to `.spec.extraManifestsRefs` in ClusterInstance.

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
With this feature, via ClusterInstance, users can now have control over this process and can inject manifets during installation by creating a configMap in a Kustomization file and later reference back the configMap name to `.spec.extraManifestsRefs` in ClusterInstance.
With this feature, via ClusterInstance, users can now have control over this process and can inject manifests during installation by creating a configMap in a Kustomization file and later reference back the configMap name to `.spec.extraManifestsRefs` in ClusterInstance.

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.

Minor typo nit, will clean up as part of future pr

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

openshift-ci Bot commented Jul 31, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abraham2512, 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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@abraham2512

Copy link
Copy Markdown
Member

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit aeb08d4 into openshift-kni:main Jul 31, 2026
5 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Collaborator

@irinamihai: Jira Issue OCPBUGS-62684: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-62684 has not been moved to the MODIFIED state.

Details

In response to this:

RAN only:

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.

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants