Add support for containerd

gardener · Jun 13, 2020 · a0160bf · a0160bf
1 parent 7794d16
commit a0160bf
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
@@ -15,8 +15,6 @@
 package generator
 
 import (
-	"text/template"
-
 	ostemplate "github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/template"
 	"github.com/gobuffalo/packr/v2"
 	"k8s.io/apimachinery/pkg/util/runtime"
@@ -32,7 +30,7 @@ func init() {
 	cloudInitTemplateString, err := box.FindString("cloud-init.gardenlinux.template")
 	runtime.Must(err)
 
-	cloudInitTemplate, err := template.New("cloud-init").Parse(cloudInitTemplateString)
+	cloudInitTemplate, err := ostemplate.NewTemplate("cloud-init").Parse(cloudInitTemplateString)
 	runtime.Must(err)
 	cloudInitGenerator = ostemplate.NewCloudInitGenerator(cloudInitTemplate, ostemplate.DefaultUnitsPath, cmd)
 }

diff --git a/pkg/generator/generator_test.go b/pkg/generator/generator_test.go
@@ -17,15 +17,34 @@ package generator_test
 import (
 	gardenlinux_generator "github.com/gardener/gardener-extension-os-gardenlinux/pkg/generator"
 
+	commongen "github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/generator"
 	"github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/generator/test"
+	"github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/gobuffalo/packr"
 	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("Garden Linux OS Generator Test", func() {
 
 	Describe("Conformance Tests", func() {
 		var box = packr.NewBox("./testfiles")
+		g := gardenlinux_generator.CloudInitGenerator()
 		test.DescribeTest(gardenlinux_generator.CloudInitGenerator(), box)()
+
+		It("should render correctly with Containerd enabled", func() {
+			expectedCloudInit, err := box.Find("cloud-init-containerd")
+			Expect(err).NotTo(HaveOccurred())
+
+			cloudInit, _, err := g.Generate(
+				&commongen.OperatingSystemConfig{
+					CRI: &v1alpha1.CRIConfig{
+						Name: v1alpha1.CRINameContainerD,
+					},
+				})
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cloudInit).To(Equal(expectedCloudInit))
+		})
 	})
 })
diff --git a/pkg/generator/templates/cloud-init.gardenlinux.template b/pkg/generator/templates/cloud-init.gardenlinux.template
@@ -6,6 +6,16 @@ cat << EOF | base64 -d > '{{ .Path }}'
 EOF
 {{- end -}}
 
+{{ if isContainerDEnabled .CRI -}}
+mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF > /etc/systemd/system/containerd.service.d/11-exec_config.conf
+[Service]
+ExecStart=
+ExecStart=/usr/bin/containerd --config=/etc/containerd/config.toml
+EOF
+chmod 0644 /etc/systemd/system/containerd.service.d/11-exec_config.conf
+{{ end -}}
+
 {{- range $_, $file := .Files -}}
 mkdir -p '{{ $file.Dirname }}'
 {{ template "put-content" $file }}
@@ -30,8 +40,12 @@ grep -sq "^nfsd$" /etc/modules || echo "nfsd" >>/etc/modules
 modprobe nfsd
 systemctl daemon-reload
 {{ if .Bootstrap }}
+{{ if isContainerDEnabled .CRI -}}
+systemctl enable containerd && systemctl restart containerd
+{{- else -}}
 systemctl enable docker && systemctl restart docker
 {{ end -}}
+{{ end -}}
 
 
 {{ range $_, $unit := .Units -}}

diff --git a/pkg/generator/testfiles/cloud-init-containerd b/pkg/generator/testfiles/cloud-init-containerd
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF > /etc/systemd/system/containerd.service.d/11-exec_config.conf
+[Service]
+ExecStart=
+ExecStart=/usr/bin/containerd --config=/etc/containerd/config.toml
+EOF
+chmod 0644 /etc/systemd/system/containerd.service.d/11-exec_config.conf
+
+
+systemctl daemon-reload
+