Containerd 2.2: support setting max-concurrent-unpacks#886
Conversation
|
Putting to draft as the depending bottlerocket-os/bottlerocket-settings-sdk#119 is not yet merged. |
01a226f to
16df481
Compare
|
I'm wondering if there is a way to piggyback on what already exists for |
Yeah, the implementation is basically mimicking what we did for And due to the difference in the semantic of these two, the warning message will be different, in which case a separate service makes sense to me. We can arguably reuse the timer, but |
|
That's fair. The consistency of naming over code reuse is an acceptable tradeoff. :) |
|
The commits are a bit messed up on this one. The settings-sdk bump has schnauzer fixes as well. You may rebase not as my PR with the settings-sdk is merged. |
16df481 to
25d42e8
Compare
Signed-off-by: Yutong Sun <yutongsu@amazon.com>
Signed-off-by: Yutong Sun <yutongsu@amazon.com>
25d42e8 to
12563ae
Compare
Yes, just dropped the commit in my PR for the settings sdk bump. |
|
Force pushed drop the commits to bump settings sdk as that is merged along with #901. Also addressed comments per @arnaldo2792 |
Issue number:
Related: #806
Description of changes:
Expose containerd 2.2's
max_concurrent_unpackstransfer service setting viasettings.container-runtime.max-concurrent-unpacks, and add warning infrastructure for variants using older containerd versions.Containerd 2.2 templates:
{{#if settings.container-runtime.max-concurrent-unpacks}}block tocontainerd-config-toml_k8s_containerd_sockandcontainerd-config-toml_k8s_nvidia_containerd_sock, renderingmax_concurrent_unpacksunder[plugins."io.containerd.transfer.v1.local"]Unsupported setting warning (containerd 1.7 and 2.1):
unsupported-setting-warning@.serviceandunsupported-setting-warning@.timersystemd template units in the release package (same pattern asdeprecation-warning@)max-concurrent-unpacks-unsupportedadded to containerd-1.7 and containerd-2.1 packages — writes an env file to/etc/unsupported-settings/when the setting is configuredThe setting "container-runtime.max-concurrent-unpacks" is not supported by the containerd version in this variant and has no effect.Depends on bottlerocket-os/bottlerocket-settings-sdk#119 for the settings model.
Testing done:
Built aws-k8s-1.35 variant with both containerd 2.2 and containerd 2.1, using the setting introduced in bottlerocket-os/bottlerocket-settings-sdk#119. Launched EC2 instances with
settings.container-runtime.max-concurrent-unpacks = 5in user data.Containerd 2.2:
/etc/containerd/config.tomlrendersmax_concurrent_unpacks = 5under[plugins."io.containerd.transfer.v1.local"]✅Containerd 2.1:
max_concurrent_unpacksnot rendered in containerd config ✅The setting container-runtime.max-concurrent-unpacks is not supported by the containerd version in this variant and has no effect.✅Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.