Merge pull request #1145 from jgehrcke/jp/containerd-config

scripts/create-kind-cluster: use nvidia-ctk stable channel & `--config-source=command` cli arg

Author: jgehrcke

demo/clusters/kind/scripts/create-kind-cluster.sh

@@ -39,18 +39,21 @@ docker exec -it "${KIND_CLUSTER_NAME}-worker" bash -c "apt-get update && apt-get
 
 docker exec -it "${KIND_CLUSTER_NAME}-worker" bash -c " \
 	curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
-  && curl -s -L https://nvidia.github.io/libnvidia-container/experimental/deb/nvidia-container-toolkit.list | \
+  && curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
     sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \
     tee /etc/apt/sources.list.d/nvidia-container-toolkit.list \
   && \
     apt-get update \
   && apt-get install -y nvidia-container-toolkit"
 
-# We configure the NVIDIA Container Runtime to only trigger on the nvidia.cdi.k8s.io annotation and enable CDI in containerd.
+# We configure the NVIDIA Container Runtime to only trigger on the nvidia.cdi.k8s.io
+# annotation and enable CDI in containerd. --config-source=command obtains the
+# containerd base config dynamically from containerd itself, via
+# `containerd config dump`. See https://github.com/NVIDIA/nvidia-container-toolkit/pull/686
 docker exec -it "${KIND_CLUSTER_NAME}-worker" bash -c "\
 	nvidia-ctk config --set nvidia-container-runtime.modes.cdi.annotation-prefixes=nvidia.cdi.k8s.io/ \
 	&& \
-	nvidia-ctk runtime configure --runtime=containerd --cdi.enabled \
+	nvidia-ctk runtime configure --runtime=containerd --cdi.enabled --config-source=command \
 	&& \
 	systemctl restart containerd"