fix: support containerd v2 sandbox config and ignore pause image pull…#44
Merged
fix: support containerd v2 sandbox config and ignore pause image pull…#44
Conversation
… errors Containerd v2 renamed `sandbox_image` to `sandbox` in its config. The sed command now replaces both keys so the pause image is set correctly regardless of the containerd version. Also adds `ignorePreflightErrors: [ImagePull]` to init/join nodeRegistration so kubeadm does not fail when the built-in pause tag differs from the registry. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 40 minutes and 20 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (7)
WalkthroughReplaced VSphereResourcePool-based static allocation pool docs/manifests with VSphereMachineConfigPool equivalents, changed node-slot network schema from Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Template as VM Template (with files + preKubeadm)
participant VM as Provisioned VM
participant Containerd as containerd
participant FileSys as /root/images/*.tar
participant Kubeadm as kubeadm/kubelet
Note over Template,VM: Bootstrap script injected at /usr/local/bin/capv-load-local-images.sh (via Template.files)
Template->>VM: boot + run preKubeadmCommands (invoke capv-load-local-images.sh)
VM->>FileSys: wait for /root/images/*.tar presence
FileSys-->>VM: .tar files present
VM->>Containerd: restart containerd (ensure /var/lib/containerd mounted)
VM->>Containerd: run `ctr` import on /root/images/*.tar
Containerd-->>VM: images available
VM->>Kubeadm: proceed with kubeadm init/join (kubelet starts with ignorePreflightErrors: [ImagePull])
Kubeadm-->>VM: cluster bootstrap completes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Deploying alauda-immutable-infra with
|
| Latest commit: |
e4a4897
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://746ee86a.alauda-immutable-infra.pages.dev |
| Branch Preview URL: | https://fix-containerd-sandbox-compa.alauda-immutable-infra.pages.dev |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx`:
- Around line 877-885: The bootstrap wait loops in the capv-load-local-images.sh
blocks (the mountpoint check for /var/lib/containerd and the systemctl is-active
--quiet containerd loop) can block forever; add bounded timeouts by introducing
a max retry/count or timeout variable (e.g., MAX_WAIT_SECONDS or MAX_RETRIES),
incrementing a counter each sleep iteration, and breaking with a clear error log
and non-zero exit when the limit is reached; apply the same change to both the
mountpoint loop and the systemctl loop (and replicate for the other similar
blocks), optionally allowing the timeout to be configurable via an environment
variable for flexibility.
🪄 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: Pro
Run ID: c761246b-dce4-4eee-b725-7198544dd5fd
📒 Files selected for processing (6)
docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdxdocs/en/create-cluster/vmware-vsphere/extension-scenarios.mdxdocs/en/create-cluster/vmware-vsphere/index.mdxdocs/en/create-cluster/vmware-vsphere/parameter-checklist.mdxdocs/en/manage-nodes/vmware-vsphere.mdxdocs/en/upgrade-cluster/vmware-vsphere.mdx
✅ Files skipped from review due to trivial changes (2)
- docs/en/upgrade-cluster/vmware-vsphere.mdx
- docs/en/create-cluster/vmware-vsphere/index.mdx
jiazhiguang
force-pushed
the
fix/containerd-sandbox-compat
branch
from
96b80d2 to
94bb276
Compare
There was a problem hiding this comment.
🧹 Nitpick comments (1)
docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx (1)
87-89: Remove duplicated baseline bullets to avoid future drift.Line 87 and Line 88 repeat the same baseline points already listed at Line 68 and Line 69. Keeping a single list improves maintainability.
✂️ Suggested cleanup
-In the baseline workflow: - -- One `VSphereMachineConfigPool` is used for control plane nodes. -- One `VSphereMachineConfigPool` is used for worker nodes.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx` around lines 87 - 89, Remove the duplicated baseline bullet points that repeat "One `VSphereMachineConfigPool` is used for control plane nodes." and "One `VSphereMachineConfigPool` is used for worker nodes." — keep only the original occurrences (the first list around the baseline section) and delete the repeated bullets later in the file so the `VSphereMachineConfigPool` statements appear only once to prevent future drift.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx`:
- Around line 87-89: Remove the duplicated baseline bullet points that repeat
"One `VSphereMachineConfigPool` is used for control plane nodes." and "One
`VSphereMachineConfigPool` is used for worker nodes." — keep only the original
occurrences (the first list around the baseline section) and delete the repeated
bullets later in the file so the `VSphereMachineConfigPool` statements appear
only once to prevent future drift.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 0d223ca5-3472-4fa7-9217-f9e1e665b212
📒 Files selected for processing (7)
.cspell/abbreviations.txtdocs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdxdocs/en/create-cluster/vmware-vsphere/extension-scenarios.mdxdocs/en/create-cluster/vmware-vsphere/index.mdxdocs/en/create-cluster/vmware-vsphere/parameter-checklist.mdxdocs/en/manage-nodes/vmware-vsphere.mdxdocs/en/upgrade-cluster/vmware-vsphere.mdx
✅ Files skipped from review due to trivial changes (5)
- .cspell/abbreviations.txt
- docs/en/upgrade-cluster/vmware-vsphere.mdx
- docs/en/create-cluster/vmware-vsphere/index.mdx
- docs/en/manage-nodes/vmware-vsphere.mdx
- docs/en/create-cluster/vmware-vsphere/parameter-checklist.mdx
Collaborator
|
PR 把“明确告诉 containerd 用哪个 pause 镜像”的做法删了，换成“从 举个例子： 这两个名字对 containerd 来说是两个不同镜像。即使底层镜像内容一样，只要名字不匹配，containerd 还是会认为
建议补一个明确方案：
|
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx`:
- Around line 872-903: The capv-load-local-images.sh import loop should fail
fast: ensure the script treats "no tar files found" and any failed ctr import as
fatal errors. Enable safe glob handling (e.g., nullglob) or explicitly check for
matching files before the for-loop that iterates /root/images/*.tar, increment
image_count on each successful ctr -n k8s.io images import, and immediately exit
non‑zero if any ctr import fails; after the loop, if image_count is zero, print
an explanatory message and exit non‑zero so bootstrap fails early rather than
proceeding with zero or partially imported images.
- Line 99: Update the docs to explicitly state which sandbox/pause image
reference(s) must exist in containerd after importing /root/images/*.tar (or
require a retag step); reference the import script capv-load-local-images.sh and
the containerd setting [plugins."io.containerd.grpc.v1.cri"].sandbox_image so
readers know to either import the exact image name expected by kubelet (e.g.,
the configured sandbox image reference) or run a mandatory retag command after
import to match containerd’s sandbox_image; also mention that
ignorePreflightErrors: [ImagePull] does not bypass kubelet CRI image resolution
at runtime.
- Around line 953-955: Update the documentation around the kubeadm config block
that uses ignorePreflightErrors: [ImagePull] to explicitly state that this is
safe only because images are preloaded by the capv-load-local-images.sh script;
mention the script name and that it runs prior to kubeadm bootstrap so ImagePull
checks can be ignored, and add a warning advising not to remove or reorder the
script without removing the ignorePreflightErrors entry. Edit the three affected
sections (the kubeadm config blocks near lines referencing ignorePreflightErrors
and the surrounding explanatory text) to add a short sentence linking
capv-load-local-images.sh to the ImagePull exemption and a caution about
potential misconfiguration if the script is changed or omitted.
🪄 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: Pro
Run ID: 49f92c83-62ec-4353-87c8-e4a9a9818107
📒 Files selected for processing (2)
docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdxdocs/en/create-cluster/vmware-vsphere/parameter-checklist.mdx
jiazhiguang
force-pushed
the
fix/containerd-sandbox-compat
branch
from
6dcbee4 to
e86e5fe
Compare
…ineConfigPool rename * Replace the preKubeadmCommands sed that rewrote sandbox_image / sandbox in /etc/containerd/config.toml with capv-load-local-images.sh that imports /root/images/*.tar into containerd. Remove the now-unused <pause_image_tag> parameter. ignorePreflightErrors: [ImagePull] is kept as a safety net. * Document that /root/images/*.tar must include the sandbox (pause) image whose reference exactly matches containerd's configured sandbox_image (v1) or sandbox (v2) value. * Harden capv-load-local-images.sh to abort on missing /root/images directory, import failures, or zero tar files. * Rename all references from VSphereResourcePool to VSphereMachineConfigPool to match the CRD rename. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
jiazhiguang
force-pushed
the
fix/containerd-sandbox-compat
branch
from
e86e5fe to
e4a4897
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
… errors
Containerd v2 renamed
sandbox_imagetosandboxin its config. The sed command now replaces both keys so the pause image is set correctly regardless of the containerd version. Also addsignorePreflightErrors: [ImagePull]to init/join nodeRegistration so kubeadm does not fail when the built-in pause tag differs from the registry.Summary by CodeRabbit