From aed163b338b9629a024af22c9eb8c6f73e022312 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 23 Oct 2019 08:02:07 -0700 Subject: [PATCH] Remove trailing whitespace trimming from containerd template --- pkg/agent/templates/templates.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/agent/templates/templates.go b/pkg/agent/templates/templates.go index b569ef7b90..866be18ff2 100644 --- 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"