Skip to content

K
k3s
Commit 68dbea6d authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Fix windows path quoting/escaping in containerd config template

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 8aa412ed) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 2d30f609
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
pkg/agent/templates/templates.go
View file @ 68dbea6d
...@@ -86,7 +86,7 @@ enable_keychain = true ...@@ -86,7 +86,7 @@ enable_keychain = true
{{end}} {{end}}
[plugins."io.containerd.snapshotter.v1.stargz".registry] [plugins."io.containerd.snapshotter.v1.stargz".registry]
config_path = "{{ .NodeConfig.Containerd.Registry }}" config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }}
{{ if .PrivateRegistryConfig }} {{ if .PrivateRegistryConfig }}
{{range $k, $v := .PrivateRegistryConfig.Configs }} {{range $k, $v := .PrivateRegistryConfig.Configs }}
...@@ -104,14 +104,14 @@ enable_keychain = true ...@@ -104,14 +104,14 @@ enable_keychain = true
{{- if not .NodeConfig.NoFlannel }} {{- if not .NodeConfig.NoFlannel }}
[plugins."io.containerd.grpc.v1.cri".cni] [plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" bin_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIBinDir }}
conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" conf_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIConfDir }}
{{end}} {{end}}
{{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }} {{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }}
[plugins."io.containerd.service.v1.tasks-service"] [plugins."io.containerd.service.v1.tasks-service"]
{{ if .NodeConfig.Containerd.BlockIOConfig }}blockio_config_file = "{{ .NodeConfig.Containerd.BlockIOConfig }}"{{end}} {{ if .NodeConfig.Containerd.BlockIOConfig }}blockio_config_file = {{ printf "%q" .NodeConfig.Containerd.BlockIOConfig }}{{end}}
{{ if .NodeConfig.Containerd.RDTConfig }}rdt_config_file = "{{ .NodeConfig.Containerd.RDTConfig }}"{{end}} {{ if .NodeConfig.Containerd.RDTConfig }}rdt_config_file = {{ printf "%q" .NodeConfig.Containerd.RDTConfig }}{{end}}
{{end}} {{end}}
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
...@@ -121,7 +121,7 @@ enable_keychain = true ...@@ -121,7 +121,7 @@ enable_keychain = true
SystemdCgroup = {{ .SystemdCgroup }} SystemdCgroup = {{ .SystemdCgroup }}
[plugins."io.containerd.grpc.v1.cri".registry] [plugins."io.containerd.grpc.v1.cri".registry]
config_path = "{{ .NodeConfig.Containerd.Registry }}" config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }}
{{ if .PrivateRegistryConfig }} {{ if .PrivateRegistryConfig }}
{{range $k, $v := .PrivateRegistryConfig.Configs }} {{range $k, $v := .PrivateRegistryConfig.Configs }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment