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

Remove trailing whitespace trimming from containerd template

Merge pull request #942 from erikwilson/fix-no-flannel
d0644492 · Erik Wilson · GitHub · 0843a3f1 · aed163b3 · d0644492
Unverified Commit d0644492 authored Oct 24, 2019 by Erik Wilson Committed by GitHub Oct 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

templates.go pkg/agent/templates/templates.go +3 -3

No files found.
--- a/pkg/agent/templates/templates.go
+++ b/pkg/agent/templates/templates.go
@@ -25,17 +25,17 @@ const ContainerdConfigTemplate = `
  disable_cgroup = true
  disable_apparmor = true
  restrict_oom_score_adj = true
-{{ end -}}
+{{end}}

 {{- if .NodeConfig.AgentConfig.PauseImage }}
  sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
-{{ end -}}
+{{end}}

 {{- if not .NodeConfig.NoFlannel }}
 [plugins.cri.cni]
  bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
  conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
-{{ end -}}
+{{end}}

 [plugins.cri.containerd.runtimes.runc]
  runtime_type = "io.containerd.runc.v2"