containerd-2.0: fix max-concurrent-downloads config placement

Signed-off-by: Kyle Sessions <[email protected]>

Author: KCSesh

packages/containerd-2.0/containerd-config-toml_k8s_containerd_sock

@@ -19,8 +19,12 @@ imports = ["/etc/containerd/config.d/*.toml"]
 [grpc]
 address = "/run/containerd/containerd.sock"
 
-# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
 [plugins."io.containerd.cri.v1.images"]
+{{#if settings.container-runtime.max-concurrent-downloads}}
+max_concurrent_downloads = {{settings.container-runtime.max-concurrent-downloads}}
+{{/if}}
+
+# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
 [plugins."io.containerd.cri.v1.images".pinned_images]
 sandbox = "localhost/kubernetes/pause:0.1.0"
 
@@ -30,9 +34,6 @@ enable_selinux = true
 {{#if settings.container-runtime.max-container-log-line-size}}
 max_container_log_line_size = {{settings.container-runtime.max-container-log-line-size}}
 {{/if}}
-{{#if settings.container-runtime.max-concurrent-downloads}}
-max_concurrent_downloads = {{settings.container-runtime.max-concurrent-downloads}}
-{{/if}}
 {{#if settings.container-runtime.enable-unprivileged-ports}}
 enable_unprivileged_ports = {{settings.container-runtime.enable-unprivileged-ports}}
 {{/if}}

packages/containerd-2.0/containerd-config-toml_k8s_nvidia_containerd_sock

@@ -19,8 +19,12 @@ imports = ["/etc/containerd/config.d/*.toml"]
 [grpc]
 address = "/run/containerd/containerd.sock"
 
-# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
 [plugins."io.containerd.cri.v1.images"]
+{{#if settings.container-runtime.max-concurrent-downloads}}
+max_concurrent_downloads = {{settings.container-runtime.max-concurrent-downloads}}
+{{/if}}
+
+# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
 [plugins."io.containerd.cri.v1.images".pinned_images]
 sandbox = "localhost/kubernetes/pause:0.1.0"
 
@@ -30,9 +34,6 @@ enable_selinux = true
 {{#if settings.container-runtime.max-container-log-line-size}}
 max_container_log_line_size = {{settings.container-runtime.max-container-log-line-size}}
 {{/if}}
-{{#if settings.container-runtime.max-concurrent-downloads}}
-max_concurrent_downloads = {{settings.container-runtime.max-concurrent-downloads}}
-{{/if}}
 {{#if settings.container-runtime.enable-unprivileged-ports}}
 enable_unprivileged_ports = {{settings.container-runtime.enable-unprivileged-ports}}
 {{/if}}