From 13755a28010041d60e3f961e226114166d235963 Mon Sep 17 00:00:00 2001 From: Tariq Ibrahim Date: Fri, 15 May 2026 00:28:15 -0700 Subject: [PATCH 1/2] [cri-o config] fix drop-in config directory used for config overrides Signed-off-by: Tariq Ibrahim (cherry picked from commit 584f68efb09956d13126441e7ef45600e0f75078) --- cmd/nvidia-ctk-installer/container/runtime/crio/crio.go | 2 +- cmd/nvidia-ctk/runtime/configure/configure.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go b/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go index a388815b8..cc16d0383 100644 --- a/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go +++ b/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go @@ -47,7 +47,7 @@ const ( // Config-based settings DefaultConfig = "/etc/crio/crio.conf" - DefaultDropInConfig = "/etc/crio/conf.d/99-nvidia.toml" + DefaultDropInConfig = "/etc/crio/crio.conf.d/99-nvidia.toml" DefaultSocket = "/var/run/crio/crio.sock" DefaultRestartMode = "systemd" diff --git a/cmd/nvidia-ctk/runtime/configure/configure.go b/cmd/nvidia-ctk/runtime/configure/configure.go index cf73eb7fe..19ae70d9c 100644 --- a/cmd/nvidia-ctk/runtime/configure/configure.go +++ b/cmd/nvidia-ctk/runtime/configure/configure.go @@ -47,7 +47,7 @@ const ( defaultDockerConfigFilePath = "/etc/docker/daemon.json" defaultContainerdDropInConfigFilePath = "/etc/containerd/conf.d/99-nvidia.toml" - defaultCrioDropInConfigFilePath = "/etc/crio/conf.d/99-nvidia.toml" + defaultCrioDropInConfigFilePath = "/etc/crio/crio.conf.d/99-nvidia.toml" defaultConfigSource = configSourceFile configSourceCommand = "command" From acbd472edf0d68a1ec922940f1d3aeb59f1abd39 Mon Sep 17 00:00:00 2001 From: Christopher Desiniotis Date: Fri, 15 May 2026 08:26:32 -0700 Subject: [PATCH 2/2] Update 1.19.1 changelog with cri-o config dir fix Signed-off-by: Christopher Desiniotis --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d51ee6bc2..9c212027d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - fix(cudacompat): Fix handling of CUDA compat on Orin - Update systemd unit conditions to execute nvidia-smi - Reintroduce restart logic to nvidia-cdi-refresh.service +- [cri-o config] fix drop-in config directory used for config overrides ## v1.19.0 - Promote v1.19.0-rc.7 to v1.19.0