Repository navigation
feat(aks-node-controller): support optional containerd image-pull settings - #9888
Merged
Sri Harsha (SriHarsha001) merged 4 commits intoOct 27, 2026
Merged
Conversation
Contributor
|
The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).
|
Sri Harsha (SriHarsha001)
changed the title
Contributor
Windows Unit Test Results 3 files 18 suites 55s ⏱️ Results for commit 7efa96c. ♻️ This comment has been updated with latest results. |
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Explicit image-pull overrides are silently ignored on Ubuntu 24.04 NVIDIA_GB nodes that preserve their baked containerd configuration.
1 open issue
1 file not reviewed
aks-node-controller/pkg/gen/aksnodeconfig/v1/containerd_config.pb.go: Generated file
What changed in this PR
Adds optional containerd image-pull settings to aks-node-controller, preserving field presence so explicit false and zero-timeout values can be distinguished from omitted settings.
Changes:
- Extends the protobuf API and generated Go bindings with synchronization and progress-timeout options.
- Validates timeout values and renders supplied settings across containerd 1.x/2.x GPU and non-GPU templates.
- Adds validation, serialization, template, and command-generation tests.
| File | Description |
|---|---|
| aks-node-controller/proto/aksnodeconfig/v1/containerd_config.proto | Defines optional image-pull settings. |
| aks-node-controller/pkg/nodeconfigutils/validation.go | Validates timeout format and rejects negative durations. |
| aks-node-controller/pkg/nodeconfigutils/validation_test.go | Tests valid, invalid, and omitted timeouts. |
| aks-node-controller/pkg/nodeconfigutils/utils_test.go | Tests field presence through JSON and protobuf round trips. |
| aks-node-controller/pkg/gen/aksnodeconfig/v1/containerd_config.pb.go | Adds generated fields, getters, and descriptors. |
| aks-node-controller/parser/templates/containerd.toml.gtpl | Renders optional settings for containerd 1.x. |
| aks-node-controller/parser/templates/containerd_v2.toml.gtpl | Renders optional settings for containerd 2.x. |
| aks-node-controller/parser/templates/containerd_v2_no_GPU.toml.gtpl | Adds settings to the non-GPU containerd 2.x template. |
| aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl | Adds settings to the non-GPU containerd 1.x template. |
| aks-node-controller/parser/parser_test.go | Tests settings in generated provisioning payloads. |
| aks-node-controller/parser/helper_test.go | Tests presence-aware rendering across template variants. |
Review effort: Balanced
Contributor
|
Contributor
|
Contributor
|
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
Supported-runtime compatibility and filesystem synchronization’s pull-mode and performance effects require human validation beyond the rendering and serialization tests.
No open issues 🎉
1 resolved since last review
1 file not reviewed
aks-node-controller/pkg/gen/aksnodeconfig/v1/containerd_config.pb.go: Generated file
Review effort: Balanced
Nishchay (awesomenix)
approved these changes
Oct 27, 2026
Sri Harsha (SriHarsha001)
deleted the
sharsha/ContainerDBootStrapUserData
branch
October 27, 2026 19:14
Collaborator
|
LGTM too |
Abigail Liang (abigailliang-aks-sig-node)
pushed a commit
that referenced
this pull request
Oct 30, 2026
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
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.
What this PR does / why we need it:
Adds ANC contract and rendering support for two customer-provided containerd
settings in the BootStrapUserData :
imagePullWithSyncFsimagePullProgressTimeoutAKS RP can map validated customer input into
Configuration.ContainerdConfigand send it to ANC through the existing bootstrap configuration flow.
regenerate the Go bindings.
the timeout; explicitly empty or malformed values are rejected.
(1.x/2.x, GPU/non-GPU).
template placement, and delivery through existing configuration variables.
When the new fields are omitted, existing rendered configuration is unchanged.
Explicit
falseis preserved.No changes to provisioning scripts, service lifecycle, parser flow, or dependencies.
This applies only when existing provisioning generates containerd configuration.PIS-cached nodes that skip
basePrepand preserved NVIDIA configurations are excluded. Containerd configuration is generated during basePrep, not nodePrep. For PIS, settings applied during preparation can be baked into the image, but settings supplied only during subsequent VM provisioning are not applied. The current legacy PIS delivery path is also outside this ANC-only change.Enabling
imagePullWithSyncFscan select local image-pull mode on containerdreleases using Transfer Service pulls, potentially affecting performance.
Which issue(s) this PR fixes:
Fixes #