OCPBUGS-62684: telco-ran: remove crun extra-manifests and complete extra-manifests reorg - #883
Conversation
…tra-manifests reorg
|
@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
📝 WalkthroughWalkthroughChangesClusterInstance install manifests
Estimated code review effort: 2 (Simple) | ~15 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
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
📒 Files selected for processing (14)
telco-ran/configuration/argocd/AdditionalManifests.mdtelco-ran/configuration/compare.shtelco-ran/configuration/kube-compare-reference/hack/compare_ignoretelco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yamltelco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yamltelco-ran/configuration/kube-compare-reference/metadata.yamltelco-ran/configuration/source-crs/optional-extra-manifest/README.mdtelco-ran/install/README.mdtelco-ran/install/clusterinstance/custom-manifests/README.mdtelco-ran/install/clusterinstance/extra-manifests/disk-encryption.yaml.tmpltelco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpltelco-ran/install/custom-manifests/README.mdtelco-ran/install/custom-manifests/enable-crun-master.yamltelco-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
There was a problem hiding this comment.
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
📒 Files selected for processing (14)
telco-ran/configuration/argocd/AdditionalManifests.mdtelco-ran/configuration/compare.shtelco-ran/configuration/kube-compare-reference/hack/compare_ignoretelco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-master.yamltelco-ran/configuration/kube-compare-reference/machine-config/crun/enable-crun-worker.yamltelco-ran/configuration/kube-compare-reference/metadata.yamltelco-ran/configuration/source-crs/optional-extra-manifest/README.mdtelco-ran/install/README.mdtelco-ran/install/clusterinstance/custom-manifests/README.mdtelco-ran/install/clusterinstance/extra-manifests/disk-encryption.yaml.tmpltelco-ran/install/clusterinstance/extra-manifests/image-registry-partition-mc.yaml.tmpltelco-ran/install/custom-manifests/README.mdtelco-ran/install/custom-manifests/enable-crun-master.yamltelco-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-ranRepository: 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 render98-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.
|
/cc @abraham2512 |
|
/jira refresh |
|
@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (bazem@redhat.com), skipping review request. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
@irinamihai: This pull request references Jira Issue OCPBUGS-62684, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (bazem@redhat.com), skipping review request. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
| @@ -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. | |||
There was a problem hiding this comment.
| 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. |
There was a problem hiding this comment.
Minor typo nit, will clean up as part of future pr
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold |
|
@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 Issue OCPBUGS-62684 has not been moved to the MODIFIED state. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
RAN only:
https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/release_notes/ocp-4-18-release-notes#ocp-release-notes-nodes-crun-default_release-notes
https://github.com/openshift/machine-config-operator/pull/4437/changes