From 68dbea6d8b8981e8175eca71929b3ab46b1c85c5 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 6 Feb 2025 10:21:56 +0000 Subject: [PATCH] Fix windows path quoting/escaping in containerd config template Signed-off-by: Brad Davidson (cherry picked from commit 8aa412ed66090b0946b1b483447742579566ba41) Signed-off-by: Brad Davidson --- pkg/agent/templates/templates.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/agent/templates/templates.go b/pkg/agent/templates/templates.go index 405e57e352..a824c35f86 100644 --- a/pkg/agent/templates/templates.go +++ b/pkg/agent/templates/templates.go @@ -86,7 +86,7 @@ enable_keychain = true {{end}} [plugins."io.containerd.snapshotter.v1.stargz".registry] - config_path = "{{ .NodeConfig.Containerd.Registry }}" + config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }} {{ if .PrivateRegistryConfig }} {{range $k, $v := .PrivateRegistryConfig.Configs }} @@ -104,14 +104,14 @@ enable_keychain = true {{- if not .NodeConfig.NoFlannel }} [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" - conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" + bin_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIBinDir }} + conf_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIConfDir }} {{end}} {{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }} [plugins."io.containerd.service.v1.tasks-service"] - {{ if .NodeConfig.Containerd.BlockIOConfig }}blockio_config_file = "{{ .NodeConfig.Containerd.BlockIOConfig }}"{{end}} - {{ if .NodeConfig.Containerd.RDTConfig }}rdt_config_file = "{{ .NodeConfig.Containerd.RDTConfig }}"{{end}} + {{ if .NodeConfig.Containerd.BlockIOConfig }}blockio_config_file = {{ printf "%q" .NodeConfig.Containerd.BlockIOConfig }}{{end}} + {{ if .NodeConfig.Containerd.RDTConfig }}rdt_config_file = {{ printf "%q" .NodeConfig.Containerd.RDTConfig }}{{end}} {{end}} [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] @@ -121,7 +121,7 @@ enable_keychain = true SystemdCgroup = {{ .SystemdCgroup }} [plugins."io.containerd.grpc.v1.cri".registry] - config_path = "{{ .NodeConfig.Containerd.Registry }}" + config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }} {{ if .PrivateRegistryConfig }} {{range $k, $v := .PrivateRegistryConfig.Configs }}