Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #942 from erikwilson/fix-no-flannel

Browse Source 
Remove trailing whitespace trimming from containerd template
This commit is contained in:
Erik Wilson 2019-10-24 21:29:14 -07:00 committed by GitHub
commit d0644492bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/agent/templates/templates.go
View File

@ -25,17 +25,17 @@ const ContainerdConfigTemplate = `
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}}
[plugins.cri.containerd.runtimes.runc] [plugins.cri.containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2" runtime_type = "io.containerd.runc.v2"