Skip to content

K
k3s
Commit 1df72d14 authored by Erik Wilson's avatar Erik Wilson
Browse files
Options

Cleanup containerd config template spacing

parent 90df4a19
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
pkg/agent/templates/templates.go
View file @ 1df72d14
...@@ -15,24 +15,24 @@ type ContainerdConfig struct { ...@@ -15,24 +15,24 @@ type ContainerdConfig struct {
const ContainerdConfigTemplate = ` const ContainerdConfigTemplate = `
[plugins.opt] [plugins.opt]
path = "{{ .NodeConfig.Containerd.Opt }}" path = "{{ .NodeConfig.Containerd.Opt }}"
[plugins.cri] [plugins.cri]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
stream_server_port = "10010" stream_server_port = "10010"
{{- if .IsRunningInUserNS }} {{- if .IsRunningInUserNS }}
disable_cgroup = true disable_cgroup = true
disable_apparmor = true disable_apparmor = true
restrict_oom_score_adj = true restrict_oom_score_adj = true
{{ end -}} {{ end -}}
{{- if .NodeConfig.AgentConfig.PauseImage }} {{- if .NodeConfig.AgentConfig.PauseImage }}
sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}" sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
{{ end -}} {{ end -}}
{{- if not .NodeConfig.NoFlannel }} {{- if not .NodeConfig.NoFlannel }}
[plugins.cri.cni] [plugins.cri.cni]
bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
{{ end -}} {{ end -}}
......
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